summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
diff options
context:
space:
mode:
authorCarlos J. Puga Medina <cpm@FreeBSD.org>2019-08-12 10:39:48 +0000
committerCarlos J. Puga Medina <cpm@FreeBSD.org>2019-08-12 10:39:48 +0000
commit4931d3869a6dd44297e7062d19250b953725dca9 (patch)
treece003d403a39427dd9d741e17935752ff90aa5a6 /www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
parentFix install with Perl 5.30 and all future possible versions. (diff)
www/chromium: Update to 76.0.3809.100
Changelog: https://chromium.googlesource.com/chromium/src/+log/75.0.3770.142..76.0.3809.100?pretty=fuller&n=10000 Submitted by: Matthias Wolf <matthias@rheinwolf.de> MFH: 2019Q3
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.cc20
1 files changed, 10 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 0e1d75e4a9f5..b7710c4836b2 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 2019-06-04 18:55:16 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2019-07-24 18:58:07 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -218,9 +218,9 @@
+@@ -220,9 +220,9 @@
#include "components/arc/metrics/stability_metrics_manager.h"
#endif // defined(OS_CHROMEOS)
@@ -12,16 +12,16 @@
#if defined(OS_LINUX)
#include "components/crash/content/app/breakpad_linux.h"
-@@ -258,7 +258,7 @@
+@@ -260,7 +260,7 @@
#endif // defined(OS_WIN)
#if defined(OS_WIN) || defined(OS_MACOSX) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
+ #include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
#endif
-
-@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1079,7 +1079,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
}
@@ -30,7 +30,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 .
-@@ -1056,14 +1056,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1088,14 +1088,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
&user_native_messaging_dir));
if (!base::PathExists(user_native_messaging_dir))
base::CreateDirectory(user_native_messaging_dir);
@@ -48,16 +48,16 @@
#if defined(OS_MACOSX)
// Get the Keychain API to register for distributed notifications on the main
-@@ -1091,7 +1091,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1125,7 +1125,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#if defined(OS_WIN) || defined(OS_MACOSX) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
metrics::DesktopSessionDurationTracker::Initialize();
+ ProfileActivityMetricsRecorder::Initialize();
#endif
- metrics::RendererUptimeTracker::Initialize();
-@@ -1253,6 +1253,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1291,6 +1291,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
base::TimeDelta::FromMinutes(1));
#if !defined(OS_ANDROID)
@@ -65,7 +65,7 @@
if (base::FeatureList::IsEnabled(features::kWebUsb)) {
web_usb_detector_.reset(new WebUsbDetector());
BrowserThread::PostAfterStartupTask(
-@@ -1261,6 +1262,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
+@@ -1299,6 +1300,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
base::BindOnce(&WebUsbDetector::Initialize,
base::Unretained(web_usb_detector_.get())));
}