svn commit: r378071 - in head/www/chromium: . files

Rene Ladan rene at FreeBSD.org
Wed Jan 28 17:01:24 UTC 2015 

Author: rene
Date: Wed Jan 28 17:01:15 2015
New Revision: 378071
URL: https://svnweb.freebsd.org/changeset/ports/378071
QAT: https://qat.redports.org/buildarchive/r378071/

Log:
  www/chromium: update to 40.0.2214.93
  
  Many thanks to Imre Vadasz for porting it to 40.0.2214.91. [1]
  
  Obtained from:	https://github.com/gliaskos/freebsd-chromium/ pull request 8,9
  MFH:		2015Q1
  Security:	http://www.vuxml.org/freebsd/e30e0c99-a1b7-11e4-b85c-00262d5ed8ee.html

Added:
  head/www/chromium/files/patch-chrome__browser__download__download_prefs.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__download__download_prefs.h   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h   (contents, props changed)
  head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc   (contents, props changed)
  head/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc   (contents, props changed)
  head/www/chromium/files/patch-device__serial__serial_service_impl.cc   (contents, props changed)
  head/www/chromium/files/patch-net__base__net_util_posix.cc   (contents, props changed)
  head/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc   (contents, props changed)
Deleted:
  head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi
  head/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc
  head/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h
  head/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h
  head/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h
  head/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp
Modified:
  head/www/chromium/Makefile
  head/www/chromium/distinfo
  head/www/chromium/files/extra-patch-clang
  head/www/chromium/files/extra-patch-gcc
  head/www/chromium/files/patch-cc__layers__layer_impl.cc
  head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
  head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
  head/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
  head/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc
  head/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
  head/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
  head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
  head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
  head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
  head/www/chromium/files/patch-chrome__common__pref_names.cc
  head/www/chromium/files/patch-chrome__common__pref_names.h
  head/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
  head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
  head/www/chromium/files/patch-content__browser__child_process_launcher.cc
  head/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
  head/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
  head/www/chromium/files/patch-content__gpu__gpu_main.cc
  head/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
  head/www/chromium/files/patch-remoting__remoting_host.gypi
  head/www/chromium/files/patch-skia__skia_chrome.gypi
  head/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
  head/www/chromium/files/patch-third_party__sqlite__sqlite.gyp
  head/www/chromium/pkg-plist

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/Makefile	Wed Jan 28 17:01:15 2015	(r378071)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	39.0.2171.99
-PORTREVISION=	1
+PORTVERSION=	40.0.2214.93
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -42,7 +41,6 @@ LIB_DEPENDS=	libcairo.so:${PORTSDIR}/gra
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \
 		libnspr4.so:${PORTSDIR}/devel/nspr \
-		libprotobuf.so:${PORTSDIR}/devel/protobuf \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libre2.so:${PORTSDIR}/devel/re2 \
 		libsnappy.so:${PORTSDIR}/archivers/snappy \
@@ -107,7 +105,7 @@ GYP_DEFINES+=	\
 		use_system_libxml=1 \
 		use_system_libxslt=1 \
 		use_system_nspr=1 \
-		use_system_protobuf=1 \
+		use_system_protobuf=0 \
 		use_system_re2=1 \
 		use_system_snappy=1 \
 		use_system_speex=1 \
@@ -220,7 +218,7 @@ CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
 
 pre-everything::
 	@${ECHO_MSG}
-	@${ECHO_MSG} "To build Chromium, you should have around 1 GB of memory"
+	@${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory"
 .if ${PORT_OPTIONS:MDEBUG}
 	@${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)."
 .else
@@ -275,6 +273,9 @@ pre-configure:
 		'third_party/gardiner_mod' \
 		'third_party/fips181' \
 		'third_party/flot' \
+		'third_party/google_input_tools' \
+		'third_party/google_input_tools/third_party/closure_library' \
+		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
 		'third_party/hunspell' \
 		'third_party/iccjpeg' \
 		'third_party/icu/icu.isolate' \
@@ -299,12 +300,14 @@ pre-configure:
 		'third_party/modp_b64' \
 		'third_party/mt19937ar' \
 		'third_party/npapi' \
+		'third_party/openmax_dl' \
 		'third_party/opus' \
 		'third_party/ots' \
 		'third_party/pdfium' \
 		'third_party/pdfium/third_party' \
 		'third_party/ply' \
 		'third_party/polymer' \
+		'third_party/protobuf' \
 		'third_party/pywebsocket' \
 		'third_party/qcms' \
 		'third_party/qunit' \
@@ -329,7 +332,7 @@ pre-configure:
 		'third_party/zlib' \
 		'url/third_party/mozilla' \
 		'v8/src/third_party/valgrind' \
-		'v8/third_party/fdlibm' \
+		'v8/src/third_party/fdlibm' \
 		--do-remove || ${FALSE}
 	cd ${WRKSRC} && ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gyp_files.py \

Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/distinfo	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,4 +1,4 @@
-SHA256 (chromium-39.0.2171.99.tar.xz) = 6d527003a7dc3256a266d33fa42185c75934efd6de14f51cde345701ba2ae449
-SIZE (chromium-39.0.2171.99.tar.xz) = 253080280
-SHA256 (chromium-39.0.2171.99-testdata.tar.xz) = 2daf63226cfb78b7c67a1ddfd7d105e61392020f1b7484495174468e636275ae
-SIZE (chromium-39.0.2171.99-testdata.tar.xz) = 115235592
+SHA256 (chromium-40.0.2214.93.tar.xz) = c4937596bc02d346a89543a6b5bd0fab9f45e34f3ce20dee94dc132a95c990de
+SIZE (chromium-40.0.2214.93.tar.xz) = 284982688
+SHA256 (chromium-40.0.2214.93-testdata.tar.xz) = 883761dd8f559c849f0998fbf4144f2d35a171a8fff67dbc464e3bb8a5da552b
+SIZE (chromium-40.0.2214.93-testdata.tar.xz) = 115343772

Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/extra-patch-clang	Wed Jan 28 17:01:15 2015	(r378071)
@@ -189,17 +189,17 @@
                      CMapFormat::kFormat4, cmap_id) {
  }
 
---- v8/src/runtime.cc.orig	2013-11-08 08:01:04.000000000 +0100
-+++ v8/src/runtime.cc	2013-11-15 13:17:39.000000000 +0100
-@@ -14043,7 +14043,7 @@
+--- v8/src/runtime/runtime-i18n.cc.orig	2015-01-25 15:08:31.732972197 +0100
++++ v8/src/runtime/runtime-i18n.cc	2015-01-25 15:09:04.260951597 +0100
+@@ -626,7 +626,7 @@
  
    local_object->SetInternalField(0, reinterpret_cast<Smi*>(break_iterator));
    // Make sure that the pointer to adopted text is NULL.
 -  local_object->SetInternalField(1, reinterpret_cast<Smi*>(NULL));
 +  local_object->SetInternalField(1, static_cast<Smi*>(NULL));
  
-   RETURN_IF_EMPTY_HANDLE(isolate,
-       JSObject::SetLocalPropertyIgnoreAttributes(
+   Factory* factory = isolate->factory();
+   Handle<String> key = factory->NewStringFromStaticChars("breakIterator");
 --- base/strings/safe_sprintf_unittest.cc.orig	2013-11-08 07:42:08.000000000 +0100
 +++ base/strings/safe_sprintf_unittest.cc	2013-11-15 15:04:45.000000000 +0100
 @@ -721,12 +721,14 @@
@@ -256,3 +256,34 @@
    }
  
    static Unique<T> CreateImmovable(Handle<T> handle) {
+--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig	2015-01-25 14:52:44 UTC
++++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
+@@ -2072,7 +2072,7 @@
+ 
+ const AudioEncoder* AudioCodingImpl::GetSenderInfo() const {
+   FATAL() << "Not implemented yet.";
+-  return reinterpret_cast<const AudioEncoder*>(NULL);
++  return static_cast<const AudioEncoder*>(NULL);
+ }
+ 
+ const CodecInst* AudioCodingImpl::GetSenderCodecInst() {
+@@ -2091,7 +2091,7 @@
+ 
+ const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const {
+   FATAL() << "Not implemented yet.";
+-  return reinterpret_cast<const ReceiverInfo*>(NULL);
++  return static_cast<const ReceiverInfo*>(NULL);
+ }
+ 
+ bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) {
+--- v8/src/debug.cc.orig	2015-01-25 14:39:37 UTC
++++ v8/src/debug.cc
+@@ -565,7 +565,7 @@
+   thread_local_.step_out_fp_ = 0;
+   // TODO(isolates): frames_are_dropped_?
+   base::NoBarrier_Store(&thread_local_.current_debug_scope_,
+-                        static_cast<base::AtomicWord>(NULL));
++                        reinterpret_cast<base::AtomicWord>(NULL));
+   thread_local_.restarter_frame_function_pointer_ = NULL;
+ }
+ 

Modified: head/www/chromium/files/extra-patch-gcc
==============================================================================
--- head/www/chromium/files/extra-patch-gcc	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/extra-patch-gcc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -66,8 +66,8 @@
  #include <jpeglib.h>
  #elif defined(USE_LIBJPEG_TURBO)
  #include "third_party/libjpeg_turbo/jpeglib.h"
---- third_party/webrtc/common_audio/wav_writer.h.orig	2014-10-17 02:57:34.000000000 +0200
-+++ third_party/webrtc/common_audio/wav_writer.h	2014-10-18 12:04:03.000000000 +0200
+--- third_party/webrtc/common_audio/wav_file.h.orig	2014-10-17 02:57:34.000000000 +0200
++++ third_party/webrtc/common_audio/wav_file.h	2014-10-18 12:04:03.000000000 +0200
 @@ -14,6 +14,7 @@
  #ifdef __cplusplus
  

Modified: head/www/chromium/files/patch-cc__layers__layer_impl.cc
==============================================================================
--- head/www/chromium/files/patch-cc__layers__layer_impl.cc	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-cc__layers__layer_impl.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,32 +1,32 @@
---- cc/layers/layer_impl.cc.orig	2014-10-10 09:15:29 UTC
+--- cc/layers/layer_impl.cc.orig	2015-01-20 21:28:14 UTC
 +++ cc/layers/layer_impl.cc
-@@ -1202,21 +1202,23 @@
+@@ -1239,21 +1239,23 @@
                                 scale_factor * scaled_scroll_bounds.height());
    scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds);
  
--  gfx::Vector2dF max_offset(
+-  gfx::ScrollOffset max_offset(
 +  // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD
 +  // which also defines max_offset
-+  gfx::Vector2dF _max_offset(
++  gfx::ScrollOffset _max_offset(
        scaled_scroll_bounds.width() - scroll_clip_layer_->bounds().width(),
        scaled_scroll_bounds.height() - scroll_clip_layer_->bounds().height());
    // We need the final scroll offset to be in CSS coords.
 -  max_offset.Scale(1 / scale_factor);
--  max_offset.SetToMax(gfx::Vector2dF());
--  return gfx::ToFlooredVector2d(max_offset);
+-  max_offset.SetToMax(gfx::ScrollOffset());
+-  return max_offset;
 +  _max_offset.Scale(1 / scale_factor);
-+  _max_offset.SetToMax(gfx::Vector2dF());
-+  return gfx::ToFlooredVector2d(_max_offset);
++  _max_offset.SetToMax(gfx::ScrollOffset());
++  return _max_offset;
  }
  
  gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() {
--  gfx::Vector2dF max_offset = MaxScrollOffset();
-+  gfx::Vector2dF _max_offset = MaxScrollOffset();
-   gfx::Vector2dF old_offset = TotalScrollOffset();
-   gfx::Vector2dF clamped_offset = old_offset;
+-  gfx::ScrollOffset max_offset = MaxScrollOffset();
++  gfx::ScrollOffset _max_offset = MaxScrollOffset();
+   gfx::ScrollOffset old_offset = TotalScrollOffset();
+   gfx::ScrollOffset clamped_offset = old_offset;
  
 -  clamped_offset.SetToMin(max_offset);
 +  clamped_offset.SetToMin(_max_offset);
-   clamped_offset.SetToMax(gfx::Vector2d());
-   gfx::Vector2dF delta = clamped_offset - old_offset;
+   clamped_offset.SetToMax(gfx::ScrollOffset());
+   gfx::Vector2dF delta = clamped_offset.DeltaFrom(old_offset);
    if (!delta.IsZero())

Modified: head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
==============================================================================
--- head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__app__chrome_main_delegate.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,11 +1,11 @@
---- chrome/app/chrome_main_delegate.h.orig	2014-10-10 09:15:29 UTC
+--- chrome/app/chrome_main_delegate.h.orig	2015-01-21 20:05:38 UTC
 +++ chrome/app/chrome_main_delegate.h
-@@ -38,7 +38,7 @@
-   virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE;
-   virtual bool DelaySandboxInitialization(
-       const std::string& process_type) OVERRIDE;
+@@ -37,7 +37,7 @@
+       const std::string& process_type) override;
+   bool ShouldSendMachPort(const std::string& process_type) override;
+   bool DelaySandboxInitialization(const std::string& process_type) override;
 -#elif defined(OS_POSIX) && !defined(OS_ANDROID)
 +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   virtual void ZygoteStarting(
-       ScopedVector<content::ZygoteForkDelegate>* delegates) OVERRIDE;
-   virtual void ZygoteForked() OVERRIDE;
+   void ZygoteStarting(
+       ScopedVector<content::ZygoteForkDelegate>* delegates) override;
+   void ZygoteForked() override;

Modified: head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,11 +1,11 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2014-10-10 09:15:30 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig	2015-01-21 20:28:15 UTC
 +++ chrome/browser/chrome_content_browser_client.h
-@@ -278,7 +278,7 @@
-   virtual net::CookieStore* OverrideCookieStoreForRenderProcess(
-       int render_process_id) OVERRIDE;
+@@ -262,7 +262,7 @@
+   net::CookieStore* OverrideCookieStoreForRenderProcess(
+       int render_process_id) override;
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX)
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
-   virtual void GetAdditionalMappedFilesForChildProcess(
+   void GetAdditionalMappedFilesForChildProcess(
        const base::CommandLine& command_line,
        int child_process_id,

Added: head/www/chromium/files/patch-chrome__browser__download__download_prefs.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__download__download_prefs.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -0,0 +1,65 @@
+--- chrome/browser/download/download_prefs.cc.orig	2015-01-24 21:51:37 UTC
++++ chrome/browser/download/download_prefs.cc
+@@ -51,7 +51,7 @@
+ // Consider downloads 'dangerous' if they go to the home directory on Linux and
+ // to the desktop on any platform.
+ bool DownloadPathIsDangerous(const base::FilePath& download_path) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::FilePath home_dir = base::GetHomeDir();
+   if (download_path == home_dir) {
+     return true;
+@@ -131,7 +131,7 @@
+                  GetDefaultDownloadDirectoryForProfile()));
+ #endif  // defined(OS_CHROMEOS)
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+   should_open_pdf_in_system_reader_ =
+       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
+@@ -205,7 +205,7 @@
+       prefs::kSaveFileDefaultDirectory,
+       default_download_path,
+       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+   registry->RegisterBooleanPref(
+       prefs::kOpenPdfDownloadInSystemReader,
+@@ -286,7 +286,7 @@
+ }
+ 
+ bool DownloadPrefs::IsAutoOpenUsed() const {
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+       (defined(OS_MACOSX) && !defined(OS_IOS))
+   if (ShouldOpenPdfInSystemReader())
+     return true;
+@@ -301,7 +301,7 @@
+     return false;
+   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
+   extension.erase(0, 1);
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+   if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
+     return true;
+@@ -333,7 +333,7 @@
+   SaveAutoOpenState();
+ }
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
+   if (should_open_pdf_in_system_reader_ == should_open)
+@@ -355,7 +355,7 @@
+ #endif
+ 
+ void DownloadPrefs::ResetAutoOpen() {
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+   SetShouldOpenPdfInSystemReader(false);
+ #endif

Added: head/www/chromium/files/patch-chrome__browser__download__download_prefs.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__download__download_prefs.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -0,0 +1,20 @@
+--- chrome/browser/download/download_prefs.h.orig	2015-01-24 21:53:47 UTC
++++ chrome/browser/download/download_prefs.h
+@@ -73,7 +73,7 @@
+   // Disables auto-open based on file extension.
+   void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+   // Store the user preference to disk. If |should_open| is true, also disable
+   // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
+@@ -105,7 +105,7 @@
+                    AutoOpenCompareFunctor> AutoOpenSet;
+   AutoOpenSet auto_open_;
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+   bool should_open_pdf_in_system_reader_;
+ #endif

Added: head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -0,0 +1,46 @@
+--- chrome/browser/download/download_shelf_context_menu.cc.orig	2015-01-24 21:45:08 UTC
++++ chrome/browser/download/download_shelf_context_menu.cc
+@@ -122,7 +122,7 @@
+       return download_item_->GetOpenWhenComplete() ||
+           download_crx_util::IsExtensionDownload(*download_item_);
+     case ALWAYS_OPEN_TYPE:
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+       if (CanOpenPdfInSystemViewer()) {
+         DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
+@@ -162,7 +162,7 @@
+       bool is_checked = IsCommandIdChecked(ALWAYS_OPEN_TYPE);
+       DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
+           download_item_->GetBrowserContext());
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+       if (CanOpenPdfInSystemViewer()) {
+         prefs->SetShouldOpenPdfInSystemReader(!is_checked);
+@@ -390,14 +390,14 @@
+ #if defined(OS_WIN)
+   if (CanOpenPdfInSystemViewer())
+     return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER;
+-#elif defined(OS_MACOSX) || defined(OS_LINUX)
++#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   if (CanOpenPdfInSystemViewer())
+     return IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
+ #endif
+   return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE;
+ }
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ bool DownloadShelfContextMenu::IsDownloadPdf() const {
+   base::FilePath path = download_item_->GetTargetFilePath();
+   return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
+@@ -409,7 +409,7 @@
+   return IsDownloadPdf() &&
+          (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date_ :
+                                             true);
+-#elif defined(OS_MACOSX) || defined(OS_LINUX)
++#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   return IsDownloadPdf();
+ #endif
+ }

Added: head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -0,0 +1,11 @@
+--- chrome/browser/download/download_shelf_context_menu.h.orig	2015-01-24 22:48:53 UTC
++++ chrome/browser/download/download_shelf_context_menu.h
+@@ -75,7 +75,7 @@
+ 
+   int GetAlwaysOpenStringId() const;
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+   bool IsDownloadPdf() const;
+   bool CanOpenPdfInSystemViewer() const;

Added: head/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -0,0 +1,34 @@
+--- chrome/browser/process_singleton_posix.cc.orig	2015-01-26 10:20:41 UTC
++++ chrome/browser/process_singleton_posix.cc
+@@ -82,11 +82,11 @@
+ #include "net/base/net_util.h"
+ #include "ui/base/l10n/l10n_util.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "chrome/browser/ui/process_singleton_dialog_linux.h"
+ #endif
+ 
+-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ #include "ui/views/linux_ui/linux_ui.h"
+ #endif
+ 
+@@ -322,7 +322,7 @@
+   if (g_disable_prompt)
+     return false;
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
+       IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
+   return ShowProcessSingletonDialog(error, relaunch_button_text);
+@@ -880,7 +880,7 @@
+     // The other process is shutting down, it's safe to start a new process.
+     return PROCESS_NONE;
+   } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) {
+-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+     // Likely NULL in unit tests.
+     views::LinuxUI* linux_ui = views::LinuxUI::instance();
+     if (linux_ui)

Added: head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -0,0 +1,38 @@
+--- chrome/browser/renderer_preferences_util.cc.orig	2015-01-26 10:24:50 UTC
++++ chrome/browser/renderer_preferences_util.cc
+@@ -13,7 +13,7 @@
+ #include "content/public/common/renderer_preferences.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #include "ui/gfx/font_render_params.h"
+ #endif
+ 
+@@ -25,7 +25,7 @@
+ #include "ui/views/controls/textfield/textfield.h"
+ #endif
+ 
+-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "chrome/browser/themes/theme_service.h"
+ #include "chrome/browser/themes/theme_service_factory.h"
+ #include "ui/views/linux_ui/linux_ui.h"
+@@ -71,7 +71,7 @@
+   prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
+ #endif
+ 
+-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   views::LinuxUI* linux_ui = views::LinuxUI::instance();
+   if (linux_ui) {
+     if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
+@@ -93,7 +93,7 @@
+   }
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+   CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
+       (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL)));
+   prefs->should_antialias_text = params.antialiasing;

Modified: head/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,16 +1,16 @@
---- chrome/browser/ssl/ssl_blocking_page.cc.orig	2014-10-10 09:15:30 UTC
+--- chrome/browser/ssl/ssl_blocking_page.cc.orig	2015-01-21 20:28:15 UTC
 +++ chrome/browser/ssl/ssl_blocking_page.cc
-@@ -234,7 +234,7 @@
-   // settings. Weird. TODO(palmer): Do something more graceful than ignoring
-   // the user's click! crbug.com/394993
-   return;
+@@ -237,7 +237,7 @@
+ #elif defined(OS_IOS)
+   // iOS does not have a way to launch the date and time settings.
+   NOTREACHED();
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
    struct ClockCommand {
      const char* pathname;
      const char* argument;
-@@ -284,7 +284,7 @@
- #if !defined(OS_CHROMEOS)
+@@ -289,7 +289,7 @@
+ #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
    base::LaunchOptions options;
    options.wait = false;
 -#if defined(OS_LINUX)

Added: head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig	2015-01-26 10:30:44
++++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
+@@ -128,7 +128,7 @@
+ }
+ 
+ void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // Now that we have some minimal ui initialized, check to see if we're
+   // running as root and bail if we are.
+   DetectRunningAsRoot();
+@@ -142,7 +142,7 @@
+   // after the metrics service is deleted.
+ }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ void ChromeBrowserMainExtraPartsAura::DetectRunningAsRoot() {
+   if (getuid() == 0) {
+     const CommandLine& command_line = *CommandLine::ForCurrentProcess();

Added: head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h.orig	2015-01-26 10:33:29
++++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
+@@ -25,7 +25,7 @@
+   void PostMainMessageLoopRun() override;
+ 
+  private:
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !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.
+   void DetectRunningAsRoot();

Modified: head/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,20 +1,38 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2014-10-14 21:32:48.000000000 +0200
-+++ chrome/browser/ui/browser_command_controller.cc	2014-10-14 21:22:15.000000000 +0200
-@@ -67,7 +67,7 @@
+--- chrome/browser/ui/browser_command_controller.cc.orig	2015-01-21 20:28:15 UTC
++++ chrome/browser/ui/browser_command_controller.cc
+@@ -69,7 +69,7 @@
  #include "chrome/browser/ui/browser_commands_chromeos.h"
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
  #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
  #endif
  
-@@ -279,7 +279,7 @@
+@@ -281,7 +281,7 @@
    if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
      return true;
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
    // If this key was registered by the user as a content editing hotkey, then
    // it is not reserved.
    ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
+@@ -469,7 +469,7 @@
+       break;
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+     case IDC_USE_SYSTEM_TITLE_BAR: {
+       PrefService* prefs = browser_->profile()->GetPrefs();
+       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
+@@ -898,7 +898,7 @@
+   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
+   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
+ #endif
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true);
+ #endif
+ 

Modified: head/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,11 +1,11 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2014-10-10 09:15:30 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2015-01-21 20:28:16 UTC
 +++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -80,7 +80,7 @@
+@@ -79,7 +79,7 @@
  #include "components/user_manager/user_manager.h"
  #endif
  
 -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
 +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD))
- #include "ui/events/x/touch_factory_x11.h"
+ #include "ui/events/devices/x11/touch_factory_x11.h"
  #endif
  

Added: head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -0,0 +1,29 @@
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2015-01-26 10:43:43 UTC
++++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
+@@ -266,7 +266,7 @@
+   //     synchronous on desktop Linux, so use that.
+   // - Ash
+   //     Releasing capture on Ash cancels gestures so avoid it.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   can_release_capture_ = false;
+ #else
+   can_release_capture_ =
+@@ -621,7 +621,7 @@
+     // that to effect the position of any windows.
+     SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);
+ 
+-#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
+     // EndMoveLoop is going to snap the window back to its original location.
+     // Hide it so users don't see this. Hiding a window in Linux aura causes
+     // it to lose capture so skip it.
+@@ -1791,7 +1791,7 @@
+     if (dragged_window)
+       exclude.insert(dragged_window);
+   }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // Exclude windows which are pending deletion via Browser::TabStripEmpty().
+   // These windows can be returned in the Linux Aura port because the browser
+   // window which was used for dragging is not hidden once all of its tabs are

Modified: head/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,20 +1,20 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2014-10-10 09:15:30 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2015-01-21 20:28:16 UTC
 +++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -36,7 +36,7 @@
+@@ -35,7 +35,7 @@
  #if defined(OS_WIN)
-   virtual HICON GetDefaultWindowIcon() const OVERRIDE;
-   virtual bool IsWindowInMetro(gfx::NativeWindow window) const OVERRIDE;
+   virtual HICON GetDefaultWindowIcon() const override;
+   virtual bool IsWindowInMetro(gfx::NativeWindow window) const override;
 -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   virtual gfx::ImageSkia* GetDefaultWindowIcon() const OVERRIDE;
+   gfx::ImageSkia* GetDefaultWindowIcon() const override;
  #endif
  
-@@ -49,7 +49,7 @@
-   virtual void OnBeforeWidgetInit(
+@@ -48,7 +48,7 @@
+   void OnBeforeWidgetInit(
        views::Widget::InitParams* params,
-       views::internal::NativeWidgetDelegate* delegate) OVERRIDE;
+       views::internal::NativeWidgetDelegate* delegate) override;
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   virtual bool WindowManagerProvidesTitleBar(bool maximized) OVERRIDE;
+   bool WindowManagerProvidesTitleBar(bool maximized) override;
  #endif
  #if defined(USE_AURA)

Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,9 +1,9 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2014-10-10 09:15:30 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2015-01-21 20:28:16 UTC
 +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -508,7 +508,7 @@
-       url.host() == chrome::kChromeUIMemoryRedirectHost ||
-       url.host() == chrome::kChromeUIStatsHost ||
-       url.host() == chrome::kChromeUITermsHost
+@@ -511,7 +511,7 @@
+ #if !defined(OS_ANDROID)
+       || url.host() == chrome::kChromeUITermsHost
+ #endif
 -#if defined(OS_LINUX) || defined(OS_OPENBSD)
 +#if defined(OS_LINUX) || defined(OS_BSD)
        || url.host() == chrome::kChromeUILinuxProxyConfigHost

Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,42 +1,38 @@
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2014-10-10 08:54:11 UTC
+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2015-01-21 20:28:16 UTC
 +++ chrome/browser/ui/webui/options/browser_options_handler.cc
-@@ -344,7 +344,8 @@
+@@ -359,7 +359,7 @@
      { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
      { "translateEnableTranslate",
        IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
-+    !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
      { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
      { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
      { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
-@@ -671,7 +672,8 @@
+@@ -692,7 +692,7 @@
        "requestProfilesInfo",
        base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
                   base::Unretained(this)));
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
-+    !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
    web_ui()->RegisterMessageCallback(
        "themesSetNative",
        base::Bind(&BrowserOptionsHandler::ThemesSetNative,
-@@ -1310,7 +1312,8 @@
+@@ -1342,7 +1342,7 @@
    ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
    bool is_system_theme = false;
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
-+    !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
    bool profile_is_supervised = profile->IsSupervised();
    is_system_theme = theme_service->UsingSystemTheme();
    base::FundamentalValue native_theme_enabled(!is_system_theme &&
-@@ -1332,7 +1335,8 @@
+@@ -1364,7 +1364,7 @@
    ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
  }
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
-+    !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
  void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) {
    content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
    Profile* profile = Profile::FromWebUI(web_ui());

Modified: head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
==============================================================================
--- head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,12 +1,11 @@
---- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2014-10-10 09:15:30 UTC
+--- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2015-01-21 20:28:16 UTC
 +++ chrome/browser/ui/webui/options/browser_options_handler.h
-@@ -204,7 +204,8 @@
+@@ -210,7 +210,7 @@
  
    void ObserveThemeChanged();
    void ThemesReset(const base::ListValue* args);
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \
-+    !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
    void ThemesSetNative(const base::ListValue* args);
  #endif
  

Modified: head/www/chromium/files/patch-chrome__common__pref_names.cc
==============================================================================
--- head/www/chromium/files/patch-chrome__common__pref_names.cc	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__common__pref_names.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,11 +1,20 @@
---- chrome/common/pref_names.cc.orig	2014-10-10 09:15:30 UTC
+--- chrome/common/pref_names.cc.orig	2015-01-21 20:28:16 UTC
 +++ chrome/common/pref_names.cc
-@@ -891,7 +891,7 @@
- // Boolean controlling whether SafeSearch is mandatory for Google Web Searches.
- const char kForceSafeSearch[] = "settings.force_safesearch";
+@@ -895,7 +895,7 @@
+ // supervised users.
+ const char kRecordHistory[] = "settings.history_recorded";
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
  // Linux specific preference on whether we should match the system theme.
  const char kUsesSystemTheme[] = "extensions.theme.use_system";
  #endif
+@@ -1425,7 +1425,7 @@
+ // upgrade a unsafe location to a safe location.
+ const char kDownloadDirUpgraded[] = "download.directory_upgrade";
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+ const char kOpenPdfDownloadInSystemReader[] =
+     "download.open_pdf_in_system_reader";

Modified: head/www/chromium/files/patch-chrome__common__pref_names.h
==============================================================================
--- head/www/chromium/files/patch-chrome__common__pref_names.h	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__common__pref_names.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,7 +1,7 @@
---- chrome/common/pref_names.h.orig	2014-10-10 09:15:30 UTC
+--- chrome/common/pref_names.h.orig	2015-01-21 20:28:16 UTC
 +++ chrome/common/pref_names.h
-@@ -289,7 +289,7 @@
- extern const char kForceSafeSearch[];
+@@ -291,7 +291,7 @@
+ extern const char kRecordHistory[];
  extern const char kDeleteTimePeriod[];
  extern const char kLastClearBrowsingDataTime[];
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -9,3 +9,12 @@
  extern const char kUsesSystemTheme[];
  #endif
  extern const char kCurrentThemePackFilename[];
+@@ -486,7 +486,7 @@
+ extern const char kDownloadDefaultDirectory[];
+ extern const char kDownloadExtensionsToOpen[];
+ extern const char kDownloadDirUpgraded[];
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_MACOSX) && !defined(OS_IOS))
+ extern const char kOpenPdfDownloadInSystemReader[];
+ #endif

Modified: head/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
==============================================================================
--- head/www/chromium/files/patch-chrome__test__base__testing_browser_process.h	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-chrome__test__base__testing_browser_process.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,13 +1,13 @@
---- chrome/test/base/testing_browser_process.h.orig	2014-10-10 09:15:30 UTC
+--- chrome/test/base/testing_browser_process.h.orig	2015-01-21 20:28:16 UTC
 +++ chrome/test/base/testing_browser_process.h
-@@ -105,8 +105,8 @@
-   virtual DownloadStatusUpdater* download_status_updater() OVERRIDE;
-   virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE;
+@@ -103,8 +103,8 @@
+   DownloadStatusUpdater* download_status_updater() override;
+   DownloadRequestLimiter* download_request_limiter() override;
  
 -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
--  virtual void StartAutoupdateTimer() OVERRIDE {}
+-  void StartAutoupdateTimer() override {}
 +#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
-+  virtual void StartAutoupdateTimer() /*OVERRIDE*/ {}
++  void StartAutoupdateTimer() /*override*/ {}
  #endif
  
-   virtual ChromeNetLog* net_log() OVERRIDE;
+   ChromeNetLog* net_log() override;

Modified: head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
==============================================================================
--- head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,4 +1,4 @@
---- components/storage_monitor/storage_monitor_freebsd.h.orig	2014-10-13 17:11:08 UTC
+--- components/storage_monitor/storage_monitor_freebsd.h.orig	2015-01-24 17:14:44 UTC
 +++ components/storage_monitor/storage_monitor_freebsd.h
 @@ -0,0 +1,47 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
@@ -36,11 +36,11 @@
 +  virtual ~StorageMonitorFreeBSD();
 +
 +  // Must be called for StorageMonitorFreeBSD to work.
-+  virtual void Init() OVERRIDE;
++  virtual void Init() override;
 + private:
 +  // StorageMonitor implementation.
 +  virtual bool GetStorageInfoForPath(const base::FilePath& path,
-+                                     StorageInfo* device_info) const OVERRIDE;
++                                     StorageInfo* device_info) const override;
 +
 +  DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD);
 +};

Modified: head/www/chromium/files/patch-content__browser__child_process_launcher.cc
==============================================================================
--- head/www/chromium/files/patch-content__browser__child_process_launcher.cc	Wed Jan 28 16:46:04 2015	(r378070)
+++ head/www/chromium/files/patch-content__browser__child_process_launcher.cc	Wed Jan 28 17:01:15 2015	(r378071)
@@ -1,6 +1,6 @@
---- content/browser/child_process_launcher.cc.orig	2014-10-10 09:15:31 UTC
+--- content/browser/child_process_launcher.cc.orig	2015-01-21 20:28:16 UTC
 +++ content/browser/child_process_launcher.cc
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
  #else
          terminate_child_on_shutdown_(true)
  #endif
@@ -9,34 +9,42 @@
          , zygote_(false)
  #endif
          {
-@@ -234,7 +234,7 @@
+@@ -190,7 +190,7 @@
+     bool launch_elevated = delegate->ShouldLaunchElevated();
+ #elif defined(OS_ANDROID)
+     // Uses |ipcfd_| instead of |ipcfd| on Android.
+-#elif defined(OS_MACOSX)
++#elif defined(OS_MACOSX) || defined(OS_BSD)
+     base::EnvironmentMap env = delegate->GetEnvironment();
+     base::ScopedFD ipcfd = delegate->TakeIpcFd();
+ #elif defined(OS_POSIX)
+@@ -253,7 +253,7 @@
+     // We need to close the client end of the IPC channel to reliably detect
      // child termination.
-     base::ScopedFD ipcfd_closer(ipcfd);
  
 -#if !defined(OS_MACOSX)
 +#if !defined(OS_MACOSX) && !defined(OS_BSD)
-     GetContentClient()->browser()->
-         GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id,
-                                                 &files_to_register);
-@@ -244,7 +244,7 @@
-                                                           process_type);
+     GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
+         *cmd_line, child_process_id, files_to_register.get());
+     if (use_zygote) {
+@@ -261,14 +261,14 @@
+           cmd_line->argv(), files_to_register.Pass(), process_type);
      } else
      // Fall through to the normal posix case below when we're not zygoting.
 -#endif  // !defined(OS_MACOSX)
 +#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
      {
        // Convert FD mapping to FileHandleMappingVector
-       base::FileHandleMappingVector fds_to_map;
-@@ -255,7 +255,7 @@
-                 base::GlobalDescriptors::kBaseDescriptor));
-       }
+       base::FileHandleMappingVector fds_to_map =
+           files_to_register->GetMappingWithIDAdjustment(
+               base::GlobalDescriptors::kBaseDescriptor);
  
 -#if !defined(OS_MACOSX)
 +#if !defined(OS_MACOSX) && !defined(OS_BSD)
        if (process_type == switches::kRendererProcess) {
          const int sandbox_fd =
              RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -263,7 +263,7 @@
+@@ -276,7 +276,7 @@
              sandbox_fd,
              GetSandboxFD()));
        }
@@ -45,7 +53,7 @@
  
        // Actually launch the app.
        base::LaunchOptions options;
-@@ -322,7 +322,7 @@
+@@ -335,7 +335,7 @@
        base::Bind(
            &Context::Notify,
            this_object.get(),
@@ -53,8 +61,8 @@
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
            use_zygote,
  #endif
-           handle));
-@@ -330,7 +330,7 @@
+           base::Passed(base::Process(handle))));
+@@ -343,7 +343,7 @@
    }
  
    void Notify(
@@ -62,9 +70,9 @@
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
        bool zygote,
  #endif
-       base::ProcessHandle handle) {
-@@ -343,7 +343,7 @@
-     if (!handle)
+       base::Process process) {
+@@ -356,7 +356,7 @@
+     if (!process_.IsValid())
        LOG(ERROR) << "Failed to launch child process";
  
 -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
@@ -72,7 +80,7 @@
      zygote_ = zygote;
  #endif
      if (client_) {
-@@ -370,7 +370,7 @@
+@@ -383,7 +383,7 @@
          BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
          base::Bind(
              &Context::TerminateInternal,
@@ -80,8 +88,8 @@
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
              zygote_,
  #endif
-             process_.handle()));
-@@ -387,7 +387,7 @@
+             base::Passed(&process_)));
+@@ -398,7 +398,7 @@
    }
  
    static void TerminateInternal(
@@ -89,8 +97,8 @@
 +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
        bool zygote,
  #endif
-       base::ProcessHandle handle) {
-@@ -401,13 +401,13 @@
+       base::Process process) {
+@@ -412,13 +412,13 @@
      process.Terminate(RESULT_CODE_NORMAL_EXIT);
      // On POSIX, we must additionally reap the child.
  #if defined(OS_POSIX)
@@ -99,23 +107,23 @@
      if (zygote) {
        // If the renderer was created via a zygote, we have to proxy the reaping
        // through the zygote process.
-       ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(handle);
+       ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(process.Handle());
      } else
 -#endif  // !OS_MACOSX
 +#endif  // !OS_MACOSX && !OS_BSD
      {
-       base::EnsureProcessTerminated(handle);
+       base::EnsureProcessTerminated(process.Handle());
      }

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

More information about the svn-ports-head mailing list