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 7f7a4d71321f..7c8276fc2158 100644 --- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2020-05-13 18:40:22 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2020-07-07 21:58:13 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -208,11 +208,11 @@ +@@ -207,11 +207,11 @@ #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) @@ -15,7 +15,7 @@ #include "components/crash/core/app/breakpad_linux.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -246,7 +246,7 @@ +@@ -245,7 +245,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -24,7 +24,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif -@@ -919,7 +919,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -918,7 +918,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -33,7 +33,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 . -@@ -928,7 +928,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -927,7 +927,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -42,8 +42,8 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -966,7 +966,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - } +@@ -954,7 +954,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + #endif // BUILDFLAG(ENABLE_VR) && OS_WIN #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) @@ -51,7 +51,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); #endif -@@ -1119,6 +1119,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1107,6 +1107,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -59,7 +59,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); base::PostTask( -@@ -1127,6 +1128,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1115,6 +1116,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } |