Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Mar 2017 21:32:19 +0000 (UTC)
From:      "Carlos J. Puga Medina" <cpm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r435428 - in head/www/chromium: . files
Message-ID:  <201703042132.v24LWJIf083590@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cpm
Date: Sat Mar  4 21:32:19 2017
New Revision: 435428
URL: https://svnweb.freebsd.org/changeset/ports/435428

Log:
  - Backport several patches of OpenBSD that add more linux code for
    font handling.
  - Disabled WebRTC support because it does not work properly on BSD
    and more patches are needed.
  - Update pkg-plist
  - Bump PORTREVISION
  
  MFH:		2017Q1

Added:
  head/www/chromium/files/patch-base_allocator_allocator__shim.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd   (contents, props changed)
  head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_app_settings__strings.grdp   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_browser__resources.grd   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_common_url__constants.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome_common_url__constants.h   (contents, props changed)
  head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc   (contents, props changed)
  head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc   (contents, props changed)
  head/www/chromium/files/patch-components_sync_base_get__session__name.cc   (contents, props changed)
  head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc   (contents, props changed)
  head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h   (contents, props changed)
  head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc   (contents, props changed)
  head/www/chromium/files/patch-content_child_child__process.cc   (contents, props changed)
  head/www/chromium/files/patch-content_child_child__process.h   (contents, props changed)
  head/www/chromium/files/patch-content_child_child__thread__impl.cc   (contents, props changed)
  head/www/chromium/files/patch-content_child_child__thread__impl.h   (contents, props changed)
  head/www/chromium/files/patch-content_common_child__process__messages.h   (contents, props changed)
  head/www/chromium/files/patch-content_common_content__switches__internal.cc   (contents, props changed)
  head/www/chromium/files/patch-content_common_view__messages.h   (contents, props changed)
  head/www/chromium/files/patch-content_renderer_pepper_pepper__media__device__manager.cc   (contents, props changed)
  head/www/chromium/files/patch-mash_package_mash__packaged__service.cc   (contents, props changed)
  head/www/chromium/files/patch-media_base_audio__latency.cc   (contents, props changed)
  head/www/chromium/files/patch-media_base_video__frame.cc   (contents, props changed)
  head/www/chromium/files/patch-media_base_video__frame.h   (contents, props changed)
  head/www/chromium/files/patch-net_disk__cache_blockfile_disk__format.h   (contents, props changed)
  head/www/chromium/files/patch-net_dns_dns__util.cc   (contents, props changed)
  head/www/chromium/files/patch-net_dns_host__resolver__proc.cc   (contents, props changed)
  head/www/chromium/files/patch-net_tools_cert__verify__tool_verify__using__path__builder.cc   (contents, props changed)
  head/www/chromium/files/patch-services_ui_gpu_gpu__main.cc   (contents, props changed)
  head/www/chromium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h   (contents, props changed)
  head/www/chromium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn   (contents, props changed)
  head/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc   (contents, props changed)
  head/www/chromium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc   (contents, props changed)
  head/www/chromium/files/patch-ui_gfx_font__list.cc   (contents, props changed)
  head/www/chromium/files/patch-ui_message__center_views_toast__contents__view.cc   (contents, props changed)
  head/www/chromium/files/patch-ui_views_mus_BUILD.gn   (contents, props changed)
  head/www/chromium/files/patch-ui_views_mus_aura__init.cc   (contents, props changed)
  head/www/chromium/files/patch-ui_views_mus_aura__init.h   (contents, props changed)
Deleted:
  head/www/chromium/files/patch-net_base_network__change__notifier.h
  head/www/chromium/files/patch-net_base_network__interfaces__linux.cc
Modified:
  head/www/chromium/Makefile
  head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
  head/www/chromium/files/patch-chrome_browser_about__flags.cc
  head/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
  head/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc
  head/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc
  head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
  head/www/chromium/files/patch-net_BUILD.gn
  head/www/chromium/files/patch-net_base_network__change__notifier.cc
  head/www/chromium/files/patch-net_base_network__interfaces__posix.cc
  head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
  head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
  head/www/chromium/files/patch-ui_base_ime_BUILD.gn
  head/www/chromium/pkg-plist

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Sat Mar  4 21:21:45 2017	(r435427)
+++ head/www/chromium/Makefile	Sat Mar  4 21:32:19 2017	(r435428)
@@ -3,7 +3,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	56.0.2924.87
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -82,7 +82,9 @@ GN_ARGS+=	is_clang=true \
 		clang_use_chrome_plugins=false \
 		enable_media_router=true \
 		enable_nacl=false \
+		enable_one_click_signin=true \
 		enable_remoting=false \
+		enable_webrtc=false \
 		toolkit_views=true \
 		use_allocator="none" \
 		use_aura=true \
@@ -253,11 +255,13 @@ do-install:
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \
 		${STAGEDIR}${DATADIR}
-.for p in chrome_100_percent chrome_200_percent keyboard_resources resources
+.for p in chrome_100_percent chrome_200_percent keyboard_resources resources \
+	mus_app_resources_100 mus_app_resources_200 mus_app_resources_strings \
+	views_mus_resources
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \
 		${STAGEDIR}${DATADIR}
 .endfor
-.for d in icudtl.dat natives_blob.bin
+.for d in icudtl.dat natives_blob.bin snapshot_blob.bin
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \

Added: head/www/chromium/files/patch-base_allocator_allocator__shim.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-base_allocator_allocator__shim.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- base/allocator/allocator_shim.cc.orig	2017-02-02 02:02:47 UTC
++++ base/allocator/allocator_shim.cc
+@@ -89,7 +89,7 @@ inline const allocator::AllocatorDispatc
+   // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully
+   // barriered on Linux+Clang, and that causes visible perf regressons.
+   return reinterpret_cast<const allocator::AllocatorDispatch*>(
+-#if defined(OS_LINUX) && defined(__clang__)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__)
+       *static_cast<const volatile subtle::AtomicWord*>(&g_chain_head)
+ #else
+       subtle::NoBarrier_Load(&g_chain_head)

Modified: head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc	Sat Mar  4 21:21:45 2017	(r435427)
+++ head/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -1,6 +1,15 @@
---- chrome/app/chrome_main_delegate.cc.orig	2017-01-26 00:49:07 UTC
+--- chrome/app/chrome_main_delegate.cc.orig	2017-02-02 02:02:48 UTC
 +++ chrome/app/chrome_main_delegate.cc
-@@ -117,7 +117,7 @@
+@@ -86,7 +86,7 @@
+ #include "chrome/app/chrome_crash_reporter_client.h"
+ #endif
+ 
+-#if !defined(DISABLE_NACL) && defined(OS_LINUX)
++#if !defined(DISABLE_NACL) && defined(OS_LINUX) && !defined(OS_BSD)
+ #include "components/nacl/common/nacl_paths.h"
+ #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
+ #endif
+@@ -117,11 +117,11 @@
  #include "ui/base/x/x11_util.h"  // nogncheck
  #endif
  
@@ -9,6 +18,47 @@
  #include "components/crash/content/app/breakpad_linux.h"
  #endif
  
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/environment.h"
+ #endif
+ 
+@@ -163,7 +163,7 @@ base::LazyInstance<ChromeContentBrowserC
+     LAZY_INSTANCE_INITIALIZER;
+ #endif
+ 
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+ base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
+     LAZY_INSTANCE_INITIALIZER;
+ #endif
+@@ -280,7 +280,7 @@ static void AdjustLinuxOOMScore(const st
+ // and resources loaded.
+ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
+   return
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+       // The zygote process opens the resources for the renderers.
+       process_type == switches::kZygoteProcess ||
+ #endif
+@@ -332,7 +332,7 @@ void HandleHelpSwitches(const base::Comm
+ }
+ #endif
+ 
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ void SIGTERMProfilingShutdown(int signal) {
+   Profiling::Stop();
+   struct sigaction sigact;
+@@ -366,7 +366,7 @@ void InitializeUserDataDir() {
+   std::string process_type =
+       command_line->GetSwitchValueASCII(switches::kProcessType);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // On Linux, Chrome does not support running multiple copies under different
+   // DISPLAYs, so the profile directory can be specified in the environment to
+   // support the virtual desktop use-case.
 @@ -560,7 +560,7 @@ bool ChromeMainDelegate::BasicStartupCom
        std::string format_str =
            command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);

Added: head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_app_google__chrome__strings.grd	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- chrome/app/google_chrome_strings.grd.orig	2017-02-02 02:02:48 UTC
++++ chrome/app/google_chrome_strings.grd
+@@ -940,7 +940,7 @@ Signing in anyway will merge Chrome info
+       </message>
+ 
+       <!-- ProcessSingleton -->
+-      <if expr="is_linux or is_macosx">
++      <if expr="is_linux or is_macosx or is_bsd">
+         <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
+           The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>).  Chrome has locked the profile so that it doesn't get corrupted.  If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
+         </message>

Added: head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_app_mash_mash__runner.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- chrome/app/mash/mash_runner.cc.orig	2017-02-02 02:02:48 UTC
++++ chrome/app/mash/mash_runner.cc
+@@ -207,7 +207,7 @@ int MashMain() {
+   service_manager::InitializeLogging();
+ 
+   std::unique_ptr<base::MessageLoop> message_loop;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::AtExitManager exit_manager;
+ #endif
+   if (!IsChild())

Added: head/www/chromium/files/patch-chrome_app_settings__strings.grdp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_app_settings__strings.grdp	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,20 @@
+--- chrome/app/settings_strings.grdp.orig	2017-02-02 02:02:48 UTC
++++ chrome/app/settings_strings.grdp
+@@ -178,7 +178,7 @@
+   <message name="IDS_SETTINGS_THEMES" desc="Name of the control which allows the user to get a theme for the browser.">
+     Themes
+   </message>
+-  <if expr="is_linux and not chromeos">
++  <if expr="is_posix and not chromeos">
+     <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
+       GTK+
+     </message>
+@@ -192,7 +192,7 @@
+       Use Classic
+     </message>
+   </if>
+-  <if expr="not is_linux or chromeos">
++  <if expr="not is_posix or chromeos">
+     <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme.">
+       Reset to default
+     </message>

Modified: head/www/chromium/files/patch-chrome_browser_about__flags.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_about__flags.cc	Sat Mar  4 21:21:45 2017	(r435427)
+++ head/www/chromium/files/patch-chrome_browser_about__flags.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -1,4 +1,4 @@
---- chrome/browser/about_flags.cc.orig	2017-01-26 00:49:08 UTC
+--- chrome/browser/about_flags.cc.orig	2017-02-02 02:02:48 UTC
 +++ chrome/browser/about_flags.cc
 @@ -776,7 +776,7 @@ const FeatureEntry kFeatureEntries[] = {
       kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
@@ -9,6 +9,20 @@
      {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
       IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
       // Uses the system preference on Mac (a different implementation).
+@@ -1291,11 +1291,11 @@ const FeatureEntry kFeatureEntries[] = {
+      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableTranslateNewUX,
+                                switches::kDisableTranslateNewUX)},
+ #endif  // OS_MACOSX
+-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
+     {"translate-2016q2-ui", IDS_FLAGS_TRANSLATE_2016Q2_UI_NAME,
+      IDS_FLAGS_TRANSLATE_2016Q2_UI_DESCRIPTION, kOsCrOS | kOsWin | kOsLinux,
+      FEATURE_VALUE_TYPE(translate::kTranslateUI2016Q2)},
+-#endif  // OS_LINUX || OS_WIN || OS_CHROMEOS
++#endif  // OS_LINUX || OS_WIN || OS_CHROMEOS || OS_BSD
+     {"translate-lang-by-ulp", IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_NAME,
+      IDS_FLAGS_TRANSLATE_LANGUAGE_BY_ULP_DESCRIPTION, kOsAll,
+      FEATURE_VALUE_TYPE(translate::kTranslateLanguageByULP)},
 @@ -1769,7 +1769,7 @@ const FeatureEntry kFeatureEntries[] = {
       IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
       FEATURE_VALUE_TYPE(features::kMaterialDesignExtensions)},

Added: head/www/chromium/files/patch-chrome_browser_browser__resources.grd
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_browser__resources.grd	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- chrome/browser/browser_resources.grd.orig	2017-02-02 02:02:48 UTC
++++ chrome/browser/browser_resources.grd
+@@ -372,7 +372,7 @@
+         <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" />
+         <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
+       </if>
+-      <if expr="desktop_linux or (is_android and enable_plugins)">
++      <if expr="desktop_linux or (is_android and enable_plugins) or is_bsd">
+         <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
+       </if>
+       <if expr="is_android">

Added: head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,20 @@
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig	2017-02-02 02:02:49 UTC
++++ chrome/browser/extensions/api/settings_private/prefs_util.cc
+@@ -83,7 +83,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+       settings_private::PrefType::PREF_TYPE_BOOLEAN;
+   (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] =
+       settings_private::PrefType::PREF_TYPE_BOOLEAN;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   (*s_whitelist)[::prefs::kUseCustomChromeFrame] =
+       settings_private::PrefType::PREF_TYPE_BOOLEAN;
+ #endif
+@@ -93,7 +93,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil
+   // Appearance settings.
+   (*s_whitelist)[::prefs::kCurrentThemeID] =
+       settings_private::PrefType::PREF_TYPE_STRING;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   (*s_whitelist)[::prefs::kUsesSystemTheme] =
+       settings_private::PrefType::PREF_TYPE_BOOLEAN;
+ #endif

Added: head/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- chrome/browser/first_run/first_run_internal_posix.cc.orig	2017-02-02 02:02:49 UTC
++++ chrome/browser/first_run/first_run_internal_posix.cc
+@@ -24,7 +24,7 @@ namespace first_run {
+ namespace internal {
+ 
+ void DoPostImportPlatformSpecificTasks(Profile* profile) {
+-#if !defined(OS_CHROMEOS)
++#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+   base::FilePath local_state_path;
+   PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
+   bool local_state_file_exists = base::PathExists(local_state_path);

Added: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,56 @@
+--- chrome/browser/task_manager/sampling/task_group.cc.orig	2017-02-02 02:02:49 UTC
++++ chrome/browser/task_manager/sampling/task_group.cc
+@@ -25,9 +25,9 @@ const int kBackgroundRefreshTypesMask =
+     REFRESH_TYPE_CPU |
+     REFRESH_TYPE_MEMORY |
+     REFRESH_TYPE_IDLE_WAKEUPS |
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     REFRESH_TYPE_FD_COUNT |
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+     REFRESH_TYPE_PRIORITY;
+ 
+ #if defined(OS_WIN)
+@@ -88,9 +88,9 @@ TaskGroup::TaskGroup(
+       nacl_debug_stub_port_(-1),
+ #endif  // !defined(DISABLE_NACL)
+       idle_wakeups_per_second_(-1),
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       open_fd_count_(-1),
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+       gpu_memory_has_duplicates_(false),
+       is_backgrounded_(false),
+       weak_ptr_factory_(this) {
+@@ -103,10 +103,10 @@ TaskGroup::TaskGroup(
+                                       weak_ptr_factory_.GetWeakPtr()),
+                            base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone,
+                                       weak_ptr_factory_.GetWeakPtr()),
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+                            base::Bind(&TaskGroup::OnOpenFdCountRefreshDone,
+                                       weak_ptr_factory_.GetWeakPtr()),
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+                            base::Bind(&TaskGroup::OnProcessPriorityDone,
+                                       weak_ptr_factory_.GetWeakPtr())));
+   worker_thread_sampler_.swap(sampler);
+@@ -282,14 +282,14 @@ void TaskGroup::OnIdleWakeupsRefreshDone
+   OnBackgroundRefreshTypeFinished(REFRESH_TYPE_IDLE_WAKEUPS);
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) {
+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+ 
+   open_fd_count_ = open_fd_count;
+   OnBackgroundRefreshTypeFinished(REFRESH_TYPE_FD_COUNT);
+ }
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+ void TaskGroup::OnProcessPriorityDone(bool is_backgrounded) {
+   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);

Added: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,39 @@
+--- chrome/browser/task_manager/sampling/task_group.h.orig	2017-02-02 02:02:49 UTC
++++ chrome/browser/task_manager/sampling/task_group.h
+@@ -91,9 +91,9 @@ class TaskGroup {
+   int nacl_debug_stub_port() const { return nacl_debug_stub_port_; }
+ #endif  // !defined(DISABLE_NACL)
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   int open_fd_count() const { return open_fd_count_; }
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+   int idle_wakeups_per_second() const { return idle_wakeups_per_second_; }
+ 
+@@ -112,9 +112,9 @@ class TaskGroup {
+ 
+   void OnIdleWakeupsRefreshDone(int idle_wakeups_per_second);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   void OnOpenFdCountRefreshDone(int open_fd_count);
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+   void OnProcessPriorityDone(bool is_backgrounded);
+ 
+@@ -159,10 +159,10 @@ class TaskGroup {
+   int nacl_debug_stub_port_;
+ #endif  // !defined(DISABLE_NACL)
+   int idle_wakeups_per_second_;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // The number of file descriptors currently open by the process.
+   int open_fd_count_;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   bool gpu_memory_has_duplicates_;
+   bool is_backgrounded_;
+ 

Added: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,44 @@
+--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig	2017-02-02 02:02:49 UTC
++++ chrome/browser/task_manager/sampling/task_group_sampler.cc
+@@ -36,9 +36,9 @@ TaskGroupSampler::TaskGroupSampler(
+     const OnCpuRefreshCallback& on_cpu_refresh,
+     const OnMemoryRefreshCallback& on_memory_refresh,
+     const OnIdleWakeupsCallback& on_idle_wakeups,
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     const OnOpenFdCountCallback& on_open_fd_count,
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+     const OnProcessPriorityCallback& on_process_priority)
+     : process_(std::move(process)),
+       process_metrics_(CreateProcessMetrics(process_.Handle())),
+@@ -46,9 +46,9 @@ TaskGroupSampler::TaskGroupSampler(
+       on_cpu_refresh_callback_(on_cpu_refresh),
+       on_memory_refresh_callback_(on_memory_refresh),
+       on_idle_wakeups_callback_(on_idle_wakeups),
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       on_open_fd_count_callback_(on_open_fd_count),
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+       on_process_priority_callback_(on_process_priority) {
+   DCHECK(blocking_pool_runner.get());
+ 
+@@ -80,7 +80,7 @@ void TaskGroupSampler::Refresh(int64_t r
+         on_memory_refresh_callback_);
+   }
+ 
+-#if defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS,
+                                                     refresh_flags)) {
+     base::PostTaskAndReplyWithResult(
+@@ -89,7 +89,7 @@ void TaskGroupSampler::Refresh(int64_t r
+         base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this),
+         on_idle_wakeups_callback_);
+   }
+-#endif  // defined(OS_MACOSX) || defined(OS_LINUX)
++#endif  // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ #if defined(OS_LINUX)
+   if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT,

Added: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,50 @@
+--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig	2017-02-02 02:02:49 UTC
++++ chrome/browser/task_manager/sampling/task_group_sampler.h
+@@ -45,9 +45,9 @@ class TaskGroupSampler : public base::Re
+   using OnCpuRefreshCallback = base::Callback<void(double)>;
+   using OnMemoryRefreshCallback = base::Callback<void(MemoryUsageStats)>;
+   using OnIdleWakeupsCallback = base::Callback<void(int)>;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   using OnOpenFdCountCallback = base::Callback<void(int)>;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   using OnProcessPriorityCallback = base::Callback<void(bool)>;
+ 
+   TaskGroupSampler(
+@@ -56,9 +56,9 @@ class TaskGroupSampler : public base::Re
+       const OnCpuRefreshCallback& on_cpu_refresh,
+       const OnMemoryRefreshCallback& on_memory_refresh,
+       const OnIdleWakeupsCallback& on_idle_wakeups,
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       const OnOpenFdCountCallback& on_open_fd_count,
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+       const OnProcessPriorityCallback& on_process_priority);
+ 
+   // Refreshes the expensive process' stats (CPU usage, memory usage, and idle
+@@ -73,9 +73,9 @@ class TaskGroupSampler : public base::Re
+   double RefreshCpuUsage();
+   MemoryUsageStats RefreshMemoryUsage();
+   int RefreshIdleWakeupsPerSecond();
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   int RefreshOpenFdCount();
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   bool RefreshProcessPriority();
+ 
+   // The process that holds the handle that we own so that we can use it for
+@@ -93,9 +93,9 @@ class TaskGroupSampler : public base::Re
+   const OnCpuRefreshCallback on_cpu_refresh_callback_;
+   const OnMemoryRefreshCallback on_memory_refresh_callback_;
+   const OnIdleWakeupsCallback on_idle_wakeups_callback_;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   const OnOpenFdCountCallback on_open_fd_count_callback_;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   const OnProcessPriorityCallback on_process_priority_callback_;
+ 
+   // To assert we're running on the correct thread.

Added: head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,16 @@
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig	2017-02-02 02:02:49 UTC
++++ chrome/browser/task_manager/sampling/task_manager_impl.cc
+@@ -160,11 +160,11 @@ void TaskManagerImpl::GetUSERHandles(Tas
+ }
+ 
+ int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   return GetTaskGroupByTaskId(task_id)->open_fd_count();
+ #else
+   return -1;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ }
+ 
+ bool TaskManagerImpl::IsTaskOnBackgroundedProcess(TaskId task_id) const {

Added: head/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_task__manager_task__manager__observer.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,16 @@
+--- chrome/browser/task_manager/task_manager_observer.h.orig	2017-02-02 02:02:49 UTC
++++ chrome/browser/task_manager/task_manager_observer.h
+@@ -40,11 +40,11 @@ enum RefreshType {
+   // or backgrounded.
+   REFRESH_TYPE_PRIORITY          = 1 << 11,
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // For observers interested in getting the number of open file descriptors of
+   // processes.
+   REFRESH_TYPE_FD_COUNT          = 1 << 12,
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+   REFRESH_TYPE_MEMORY            = REFRESH_TYPE_PHYSICAL_MEMORY |
+                                    REFRESH_TYPE_MEMORY_DETAILS,

Added: head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/input_method/input_method_engine.h.orig	2017-02-02 02:02:49 UTC
++++ chrome/browser/ui/input_method/input_method_engine.h
+@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMe
+ 
+   // ui::IMEEngineHandlerInterface:
+   bool IsActive() const override;
+-  std::string GetExtensionId() const override;
++  std::string GetExtensionId() const;
+ 
+   // Creates and shows the IME window.
+   // Returns 0 for errors and |error| will contains the error message.

Added: head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,15 @@
+--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig	2017-02-02 02:02:50 UTC
++++ chrome/browser/ui/task_manager/task_manager_columns.cc
+@@ -74,10 +74,10 @@ const TableColumnData kColumns[] = {
+   { IDS_TASK_MANAGER_IDLE_WAKEUPS_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("idlewakeups") * kCharWidth, -1, true, false, false },
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   { IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0,
+     arraysize("999") * kCharWidth, -1, true, false, false },
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+   { IDS_TASK_MANAGER_PROCESS_PRIORITY_COLUMN, ui::TableColumn::LEFT, -1, 0,
+     arraysize("background") * kCharWidth, -1, true, true, false },
+ };

Added: head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,50 @@
+--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig	2017-02-02 02:02:50 UTC
++++ chrome/browser/ui/task_manager/task_manager_table_model.cc
+@@ -390,13 +390,13 @@ base::string16 TaskManagerTableModel::Ge
+           ? stringifier_->backgrounded_string()
+           : stringifier_->foregrounded_string();
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
+       const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]);
+       return fd_count >= 0 ? base::FormatNumber(fd_count)
+                            : stringifier_->n_a_string();
+     }
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+     default:
+       NOTREACHED();
+@@ -540,7 +540,7 @@ int TaskManagerTableModel::CompareValues
+       return BooleanCompare(is_proc1_bg, is_proc2_bg);
+     }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: {
+       const int proc1_fd_count =
+           observed_task_manager()->GetOpenFdCount(tasks_[row1]);
+@@ -548,7 +548,7 @@ int TaskManagerTableModel::CompareValues
+           observed_task_manager()->GetOpenFdCount(tasks_[row2]);
+       return ValueCompare(proc1_fd_count, proc2_fd_count);
+     }
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+     default:
+       NOTREACHED();
+@@ -699,11 +699,11 @@ void TaskManagerTableModel::UpdateRefres
+       type = REFRESH_TYPE_PRIORITY;
+       break;
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN:
+       type = REFRESH_TYPE_FD_COUNT;
+       break;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+     default:
+       NOTREACHED();

Added: head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,28 @@
+--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig	2017-02-02 02:02:50 UTC
++++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
+@@ -24,14 +24,14 @@
+ #include "ui/wm/core/wm_state.h"
+ #endif  // defined(USE_AURA)
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "base/command_line.h"
+ #include "chrome/browser/ui/simple_message_box.h"
+ #include "chrome/grit/chromium_strings.h"
+ #include "chrome/grit/generated_resources.h"
+ #include "content/public/common/content_switches.h"
+ #include "ui/base/l10n/l10n_util.h"
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ 
+ ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {
+ }
+@@ -62,7 +62,7 @@ void ChromeBrowserMainExtraPartsViews::P
+ }
+ 
+ void ChromeBrowserMainExtraPartsViews::PreProfileInit() {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   // On the Linux desktop, we want to prevent the user from logging in as root,
+   // so that we don't destroy the profile. Now that we have some minimal ui
+   // initialized, check to see if we're running as root and bail if we are.

Modified: head/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc	Sat Mar  4 21:21:45 2017	(r435427)
+++ head/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/first_run_dialog.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/ui/views/first_run_dialog.cc.orig	2017-02-02 02:02:50 UTC
 +++ chrome/browser/ui/views/first_run_dialog.cc
 @@ -40,8 +40,10 @@ using views::GridLayout;
  namespace {
@@ -11,3 +11,14 @@
  }
  
  }  // namespace
+@@ -121,8 +123,10 @@ views::View* FirstRunDialog::CreateExtra
+ bool FirstRunDialog::Accept() {
+   GetWidget()->Hide();
+ 
++#if !defined(OS_BSD)
+   ChangeMetricsReportingStateWithReply(report_crashes_->checked(),
+                                        base::Bind(&InitCrashReporterIfEnabled));
++#endif
+ 
+   if (make_default_->checked())
+     shell_integration::SetAsDefaultBrowser();

Added: head/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig	2017-02-02 02:02:50 UTC
++++ chrome/browser/ui/webui/settings/appearance_handler.cc
+@@ -32,7 +32,7 @@ void AppearanceHandler::RegisterMessages
+       "useDefaultTheme",
+       base::Bind(&AppearanceHandler::HandleUseDefaultTheme,
+                  base::Unretained(this)));
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   web_ui()->RegisterMessageCallback(
+       "useSystemTheme",
+       base::Bind(&AppearanceHandler::HandleUseSystemTheme,
+@@ -50,7 +50,7 @@ void AppearanceHandler::HandleUseDefault
+   ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
+ }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ void AppearanceHandler::HandleUseSystemTheme(const base::ListValue* args) {
+   if (profile_->IsSupervised())
+     NOTREACHED();

Added: head/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/webui/settings/appearance_handler.h.orig	2017-02-02 02:02:50 UTC
++++ chrome/browser/ui/webui/settings/appearance_handler.h
+@@ -35,7 +35,7 @@ class AppearanceHandler : public Setting
+   // Changes the UI theme of the browser to the default theme.
+   void HandleUseDefaultTheme(const base::ListValue* args);
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   // Changes the UI theme of the browser to the system (GTK+) theme.
+   void HandleUseSystemTheme(const base::ListValue* args);
+ #endif

Added: head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig	2017-02-02 02:02:50 UTC
++++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+@@ -266,7 +266,7 @@ void AddAppearanceStrings(content::WebUI
+     {"appearancePageTitle", IDS_SETTINGS_APPEARANCE},
+     {"exampleDotCom", IDS_SETTINGS_EXAMPLE_DOT_COM},
+     {"themes", IDS_SETTINGS_THEMES},
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+     {"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
+     {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
+     {"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
+@@ -286,7 +286,7 @@ void AddAppearanceStrings(content::WebUI
+     {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP},
+     {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER},
+ #endif
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+     {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
+ #endif
+   };

Modified: head/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc	Sat Mar  4 21:21:45 2017	(r435427)
+++ head/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -1,11 +1,20 @@
---- chrome/browser/web_applications/web_app.cc.orig	2017-01-26 00:49:09 UTC
+--- chrome/browser/web_applications/web_app.cc.orig	2017-02-02 02:02:50 UTC
 +++ chrome/browser/web_applications/web_app.cc
+@@ -58,7 +58,7 @@ namespace {
+ #if defined(OS_MACOSX)
+ const int kDesiredSizes[] = {16, 32, 128, 256, 512};
+ const size_t kNumDesiredSizes = arraysize(kDesiredSizes);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states
+ // that "Minimally you should install a 48x48 icon in the hicolor theme."
+ const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512};
 @@ -507,7 +507,7 @@ void GetIconsInfo(const WebApplicationIn
  }
  #endif
  
 -#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
  std::string GetWMClassFromAppName(std::string app_name) {
    base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_');
    base::TrimString(app_name, "_", &app_name);

Added: head/www/chromium/files/patch-chrome_common_url__constants.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_common_url__constants.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,20 @@
+--- chrome/common/url_constants.cc.orig	2017-02-02 02:02:50 UTC
++++ chrome/common/url_constants.cc
+@@ -139,7 +139,7 @@ const char kChromeUIMdCupsSettingsURL[] 
+ const char kChromeUIMetroFlowURL[] = "chrome://make-metro/";
+ #endif
+ 
+-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
++#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+ const char kChromeUITabModalConfirmDialogURL[] =
+     "chrome://tab-modal-confirm-dialog/";
+ #endif
+@@ -332,7 +332,7 @@ const char kChromeOSAssetPath[] = "/usr/
+ const char kChromeUIMetroFlowHost[] = "make-metro";
+ #endif
+ 
+-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
++#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+ const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
+ #endif
+ 

Added: head/www/chromium/files/patch-chrome_common_url__constants.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_common_url__constants.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,20 @@
+--- chrome/common/url_constants.h.orig	2017-02-02 02:02:50 UTC
++++ chrome/common/url_constants.h
+@@ -125,7 +125,7 @@ extern const char kChromeUIMdCupsSetting
+ extern const char kChromeUIMetroFlowURL[];
+ #endif
+ 
+-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
++#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+ extern const char kChromeUITabModalConfirmDialogURL[];
+ #endif
+ 
+@@ -309,7 +309,7 @@ extern const char kChromeOSAssetPath[];
+ extern const char kChromeUIMetroFlowHost[];
+ #endif
+ 
+-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
++#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+ extern const char kChromeUITabModalConfirmDialogHost[];
+ #endif
+ 

Added: head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,29 @@
+--- chromecast/browser/cast_browser_main_parts.cc.orig	2017-02-02 02:02:51 UTC
++++ chromecast/browser/cast_browser_main_parts.cc
+@@ -67,7 +67,7 @@
+ #include <signal.h>
+ #include <sys/prctl.h>
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include <fontconfig/fontconfig.h>
+ #endif
+ 
+@@ -226,7 +226,7 @@ DefaultCommandLineSwitch g_default_switc
+ #if BUILDFLAG(IS_CAST_AUDIO_ONLY)
+   { switches::kDisableGpu, "" },
+ #endif
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #if defined(ARCH_CPU_X86_FAMILY)
+   // This is needed for now to enable the x11 Ozone platform to work with
+   // current Linux/NVidia OpenGL drivers.
+@@ -366,7 +366,7 @@ void CastBrowserMainParts::PostMainMessa
+ }
+ 
+ void CastBrowserMainParts::ToolkitInitialized() {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Without this call, the FontConfig library gets implicitly initialized
+   // on the first call to FontConfig. Since it's not safe to initialize it
+   // concurrently from multiple threads, we explicitly initialize it here

Added: head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- chromecast/browser/cast_content_browser_client.cc.orig	2017-02-02 02:02:51 UTC
++++ chromecast/browser/cast_content_browser_client.cc
+@@ -269,7 +269,7 @@ void CastContentBrowserClient::AppendExt
+       command_line->AppendSwitch(switches::kAllowHiddenMediaPlayback);
+   }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Necessary for accelerated 2d canvas.  By default on Linux, Chromium assumes
+   // GLES2 contexts can be lost to a power-save mode, which breaks GPU canvas
+   // apps.

Added: head/www/chromium/files/patch-components_sync_base_get__session__name.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-components_sync_base_get__session__name.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,20 @@
+--- components/sync/base/get_session_name.cc.orig	2017-02-02 02:02:53 UTC
++++ components/sync/base/get_session_name.cc
+@@ -15,7 +15,7 @@
+ 
+ #if defined(OS_CHROMEOS)
+ #include "chromeos/system/devicetype.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #include "components/sync/base/get_session_name_linux.h"
+ #elif defined(OS_IOS)
+ #include "components/sync/base/get_session_name_ios.h"
+@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously(
+       session_name = "Chromebook";
+       break;
+   }
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   session_name = internal::GetHostname();
+ #elif defined(OS_IOS)
+   session_name = internal::GetComputerName();

Modified: head/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc
==============================================================================
--- head/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc	Sat Mar  4 21:21:45 2017	(r435427)
+++ head/www/chromium/files/patch-components_sync_base_get__session__name__linux.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -1,22 +1,14 @@
---- components/sync/base/get_session_name_linux.cc.orig	2017-01-26 00:49:12 UTC
+--- components/sync/base/get_session_name_linux.cc.orig	2017-02-02 02:02:53 UTC
 +++ components/sync/base/get_session_name_linux.cc
-@@ -4,7 +4,7 @@
- 
- #include "components/sync/base/get_session_name_linux.h"
- 
--#include <limits.h>  // for HOST_NAME_MAX
-+#include <limits.h>  // for _POSIX_HOST_NAME_MAX
- #include <unistd.h>  // for gethostname()
- 
- #include "base/linux_util.h"
-@@ -13,8 +13,8 @@ namespace syncer {
+@@ -13,8 +13,9 @@ namespace syncer {
  namespace internal {
  
  std::string GetHostname() {
 -  char hostname[HOST_NAME_MAX];
 -  if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
-+  char hostname[_POSIX_HOST_NAME_MAX];
-+  if (gethostname(hostname, _POSIX_HOST_NAME_MAX) == 0)  // Success.
++  int len = sysconf(_SC_HOST_NAME_MAX);
++  char hostname[len];
++  if (gethostname(hostname, len) == 0)  // Success.
      return hostname;
    return base::GetLinuxDistro();
  }

Added: head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- content/browser/renderer_host/render_message_filter.cc.orig	2017-02-02 02:02:53 UTC
++++ content/browser/renderer_host/render_message_filter.cc
+@@ -92,7 +92,7 @@
+ #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/linux_util.h"
+ #include "base/threading/platform_thread.h"
+ #endif

Added: head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- content/browser/renderer_host/render_message_filter.h.orig	2017-02-02 02:02:53 UTC
++++ content/browser/renderer_host/render_message_filter.h
+@@ -175,7 +175,7 @@ class CONTENT_EXPORT RenderMessageFilter
+   void OnDeletedDiscardableSharedMemory(
+       discardable_memory::DiscardableSharedMemoryId id);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid,
+                                      base::ThreadPriority priority);
+   void OnSetThreadPriority(base::PlatformThreadId ns_tid,

Added: head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_browser_renderer__host_render__view__host__impl.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- content/browser/renderer_host/render_view_host_impl.cc.orig	2017-02-02 02:02:53 UTC
++++ content/browser/renderer_host/render_view_host_impl.cc
+@@ -139,7 +139,7 @@ void GetPlatformSpecificPrefs(RendererPr
+       display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
+   prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
+       display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   prefs->system_font_family_name = gfx::Font().GetFontName();
+ #endif
+ }

Modified: head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
==============================================================================
--- head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc	Sat Mar  4 21:21:45 2017	(r435427)
+++ head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -1,11 +1,11 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2017-01-26 00:49:13 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2017-02-02 02:02:53 UTC
 +++ content/browser/renderer_host/render_widget_host_view_aura.cc
 @@ -107,7 +107,7 @@
  #include "ui/gfx/gdi_util.h"
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
  #include "ui/base/ime/linux/text_edit_command_auralinux.h"
  #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
@@ -14,7 +14,7 @@
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    return NeedsInputGrab();
  #endif
    return false;
@@ -23,7 +23,7 @@
      return;
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
    ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate =
        ui::GetTextEditKeyBindingsDelegate();
    std::vector<ui::TextEditCommandAuraLinux> commands;

Added: head/www/chromium/files/patch-content_child_child__process.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_child_child__process.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- content/child/child_process.cc.orig	2017-02-02 02:02:53 UTC
++++ content/child/child_process.cc
+@@ -103,7 +103,7 @@ void ChildProcess::ReleaseProcess() {
+     main_thread_->OnProcessFinalRelease();
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void ChildProcess::SetIOThreadPriority(
+     base::ThreadPriority io_thread_priority) {
+   main_thread_->SetThreadPriority(io_thread_.GetThreadId(), io_thread_priority);

Added: head/www/chromium/files/patch-content_child_child__process.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_child_child__process.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- content/child/child_process.h.orig	2017-02-02 02:02:53 UTC
++++ content/child/child_process.h
+@@ -69,7 +69,7 @@ class CONTENT_EXPORT ChildProcess {
+   void AddRefProcess();
+   void ReleaseProcess();
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   void SetIOThreadPriority(base::ThreadPriority io_thread_priority);
+ #endif
+ 

Added: head/www/chromium/files/patch-content_child_child__thread__impl.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_child_child__thread__impl.cc	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- content/child/child_thread_impl.cc.orig	2017-02-02 02:02:53 UTC
++++ content/child/child_thread_impl.cc
+@@ -751,7 +751,7 @@ std::unique_ptr<base::SharedMemory> Chil
+   return base::MakeUnique<base::SharedMemory>(shared_buf, false);
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ void ChildThreadImpl::SetThreadPriority(base::PlatformThreadId id,
+                                         base::ThreadPriority priority) {
+   Send(new ChildProcessHostMsg_SetThreadPriority(id, priority));

Added: head/www/chromium/files/patch-content_child_child__thread__impl.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_child_child__thread__impl.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,11 @@
+--- content/child/child_thread_impl.h.orig	2017-02-02 02:02:53 UTC
++++ content/child/child_thread_impl.h
+@@ -130,7 +130,7 @@ class CONTENT_EXPORT ChildThreadImpl
+       IPC::Sender* sender,
+       bool* out_of_memory);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   void SetThreadPriority(base::PlatformThreadId id,
+                          base::ThreadPriority priority);
+ #endif

Added: head/www/chromium/files/patch-content_common_child__process__messages.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_common_child__process__messages.h	Sat Mar  4 21:32:19 2017	(r435428)
@@ -0,0 +1,29 @@
+--- content/common/child_process_messages.h.orig	2017-02-02 02:02:53 UTC
++++ content/common/child_process_messages.h
+@@ -27,7 +27,7 @@
+ #include "ui/gfx/ipc/gfx_param_traits.h"
+ #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"
+ 
+-#if defined(OS_LINUX)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703042132.v24LWJIf083590>