diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-06-02 20:30:55 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-06-02 20:30:55 +0000 |
| commit | 8f6dc7d1dd8b0ca59427d71524538aab9403ac23 (patch) | |
| tree | c272eeb9d12c3f96a460e7ad3fd1eb4233ad20ce /www/chromium/files/patch-chrome_browser_chrome__browser__main.cc | |
| parent | multimedia/libva-intel-driver: update to 2.4.1 (diff) | |
www/chromium: Update to version 83.0.4103.61
Submitted by: Matthias Wolf <freebsd@rheinwolf.de>
Reviewed by: rene
Approved by: chromium@ (rene)
Obtained from: https://github.com/gliaskos/freebsd-chromium
MFH: 2020Q2
Security: https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html
Differential Revision: https://reviews.freebsd.org/D25102
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 | 23 |
1 files changed, 13 insertions, 10 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 51bb283f651b..7f7a4d71321f 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-03-16 18:40:29 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2020-05-13 18:40:22 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -224,9 +224,9 @@ +@@ -208,11 +208,11 @@ #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) @@ -10,9 +10,12 @@ -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #if defined(OS_LINUX) - #include "components/crash/content/app/breakpad_linux.h" -@@ -265,7 +265,7 @@ +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + #include "components/crash/core/app/breakpad_linux.h" + #include "components/crash/core/app/crashpad.h" + #endif +@@ -246,7 +246,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -21,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 -@@ -1068,7 +1068,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -919,7 +919,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -30,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 . -@@ -1077,7 +1077,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -928,7 +928,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -39,7 +42,7 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1116,7 +1116,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -966,7 +966,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -48,7 +51,7 @@ metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); #endif -@@ -1269,6 +1269,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1119,6 +1119,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) @@ -56,7 +59,7 @@ if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); base::PostTask( -@@ -1277,6 +1278,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1127,6 +1128,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } |