mirror of
https://git.freebsd.org/ports.git
synced 2025-06-29 16:40:31 -04:00
fde2530e82
Changelog: https://chromium.googlesource.com/chromium/src/+log/74.0.3729.169..75.0.3770.80?pretty=fuller&n=10000 Submitted by: Matthias Wolf <matthias@rheinwolf.de>
75 lines
3.3 KiB
C++
75 lines
3.3 KiB
C++
--- chrome/browser/chrome_browser_main.cc.orig 2019-06-04 18:55:16 UTC
|
|
+++ chrome/browser/chrome_browser_main.cc
|
|
@@ -218,9 +218,9 @@
|
|
#include "components/arc/metrics/stability_metrics_manager.h"
|
|
#endif // defined(OS_CHROMEOS)
|
|
|
|
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
|
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
|
|
#include "chrome/browser/first_run/upgrade_util_linux.h"
|
|
-#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"
|
|
@@ -258,7 +258,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"
|
|
#endif
|
|
|
|
@@ -1047,7 +1047,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
|
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs);
|
|
}
|
|
|
|
-#if defined(OS_MACOSX) || defined(OS_LINUX)
|
|
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
|
|
// 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() {
|
|
&user_native_messaging_dir));
|
|
if (!base::PathExists(user_native_messaging_dir))
|
|
base::CreateDirectory(user_native_messaging_dir);
|
|
-#endif // defined(OS_MACOSX) || defined(OS_LINUX)
|
|
+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
|
|
}
|
|
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#if defined(OS_LINUX)
|
|
// Set the product channel for crash reports.
|
|
breakpad::SetChannelCrashKey(chrome::GetChannelName());
|
|
-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#endif // defined(OS_LINUX)
|
|
|
|
#if defined(OS_MACOSX)
|
|
// Get the Keychain API to register for distributed notifications on the main
|
|
@@ -1091,7 +1091,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();
|
|
#endif
|
|
metrics::RendererUptimeTracker::Initialize();
|
|
@@ -1253,6 +1253,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
|
|
base::TimeDelta::FromMinutes(1));
|
|
|
|
#if !defined(OS_ANDROID)
|
|
+#if !defined(OS_BSD)
|
|
if (base::FeatureList::IsEnabled(features::kWebUsb)) {
|
|
web_usb_detector_.reset(new WebUsbDetector());
|
|
BrowserThread::PostAfterStartupTask(
|
|
@@ -1261,6 +1262,7 @@ void ChromeBrowserMainParts::PostBrowserStart() {
|
|
base::BindOnce(&WebUsbDetector::Initialize,
|
|
base::Unretained(web_usb_detector_.get())));
|
|
}
|
|
+#endif
|
|
if (base::FeatureList::IsEnabled(features::kTabMetricsLogging)) {
|
|
// Initialize the TabActivityWatcher to begin logging tab activity events.
|
|
resource_coordinator::TabActivityWatcher::GetInstance();
|