diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_chrome__browser__main.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_chrome__browser__main.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc index 95d001b3ae64..58af50224c04 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,7 +1,7 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2019-04-30 22:22:32 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -217,7 +217,7 @@ - #include "chromeos/settings/cros_settings_names.h" +@@ -219,7 +219,7 @@ + #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "chrome/browser/first_run/upgrade_util_linux.h" #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -@@ -257,7 +257,7 @@ +@@ -259,7 +259,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -18,7 +18,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #endif -@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1049,7 +1049,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -27,7 +27,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1052,14 +1052,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1058,14 +1058,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -45,7 +45,7 @@ #if defined(OS_MACOSX) // Get the Keychain API to register for distributed notifications on the main -@@ -1087,7 +1087,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1093,7 +1093,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -54,7 +54,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); #endif metrics::RendererUptimeTracker::Initialize(); -@@ -1267,6 +1267,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1266,6 +1266,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -62,7 +62,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); BrowserThread::PostAfterStartupTask( -@@ -1275,6 +1276,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1274,6 +1275,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } |