2dd4dd29c0
Submitted by: Matthias Wolf via GitHub MFH: 2020Q3 Security: http://vuxml.freebsd.org/freebsd/9a447f78-d0f8-11ea-9837-e09467587c17.html Security: http://vuxml.freebsd.org/freebsd/870d59b0-c6c4-11ea-8015-e09467587c17.html
69 lines
3.1 KiB
C++
69 lines
3.1 KiB
C++
--- chrome/browser/chrome_browser_main.cc.orig 2020-07-07 21:58:13 UTC
|
|
+++ chrome/browser/chrome_browser_main.cc
|
|
@@ -207,11 +207,11 @@
|
|
#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)
|
|
+#if defined(OS_LINUX) && !defined(OS_BSD)
|
|
#include "components/crash/core/app/breakpad_linux.h"
|
|
#include "components/crash/core/app/crashpad.h"
|
|
#endif
|
|
@@ -245,7 +245,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
|
|
@@ -918,7 +918,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 .
|
|
@@ -927,7 +927,7 @@ 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)
|
|
|
|
@@ -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))
|
|
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD))
|
|
metrics::DesktopSessionDurationTracker::Initialize();
|
|
ProfileActivityMetricsRecorder::Initialize();
|
|
#endif
|
|
@@ -1107,6 +1107,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());
|
|
base::PostTask(
|
|
@@ -1115,6 +1116,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();
|