diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc index 1e5739b93ace..ace3fd54184e 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -224,7 +224,7 @@ +@@ -242,7 +242,7 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chromeos/chromeos_switches.h" #include "components/user_manager/user_manager.h" @@ -9,8 +9,8 @@ #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "chrome/browser/chrome_browser_main_android.h" -@@ -236,7 +236,7 @@ - #include "chrome/browser/chrome_browser_main_posix.h" +@@ -258,7 +258,7 @@ + #include "chrome/browser/payments/payment_request_factory.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -18,7 +18,7 @@ #include "base/debug/leak_annotations.h" #include "components/crash/content/app/breakpad_linux.h" #include "components/crash/content/browser/crash_handler_host_linux.h" -@@ -261,7 +261,7 @@ +@@ -281,7 +281,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,7 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -555,7 +555,7 @@ bool CertMatchesFilter(const net::X509Ce +@@ -576,7 +576,7 @@ bool CertMatchesFilter(const net::X509Ce return false; } @@ -36,7 +36,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -883,7 +883,7 @@ content::BrowserMainParts* ChromeContent +@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContent main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); @@ -45,7 +45,7 @@ main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -899,7 +899,7 @@ content::BrowserMainParts* ChromeContent +@@ -915,7 +915,7 @@ content::BrowserMainParts* ChromeContent // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -53,8 +53,8 @@ +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else - main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1531,7 +1531,7 @@ void ChromeContentBrowserClient::AppendE + ChromeBrowserMainExtraPartsViews* extra_parts_views = +@@ -1552,7 +1552,7 @@ void ChromeContentBrowserClient::AppendE command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -63,12 +63,21 @@ if (breakpad::IsCrashReporterEnabled()) { std::string switch_value; std::unique_ptr<metrics::ClientInfo> client_info = -@@ -2834,7 +2834,7 @@ void ChromeContentBrowserClient::GetAddi - PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path); - DCHECK(!app_data_path.empty()); +@@ -2808,7 +2808,7 @@ void ChromeContentBrowserClient::GetAddi + } } --#elif defined(OS_POSIX) && !defined(OS_MACOSX) -+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, +@@ -2837,7 +2837,7 @@ void ChromeContentBrowserClient::GetAddi + } + #endif // defined(OS_ANDROID) + } +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + + #if defined(OS_WIN) + base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( |