Differential D23984 Diff 69308 head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
--- chrome/browser/chrome_browser_main.cc.orig 2019-12-16 21:51:23 UTC | --- chrome/browser/chrome_browser_main.cc.orig 2020-03-03 18:53:51 UTC | ||||
+++ chrome/browser/chrome_browser_main.cc | +++ chrome/browser/chrome_browser_main.cc | ||||
@@ -220,9 +220,9 @@ | @@ -223,9 +223,9 @@ | ||||
#include "components/arc/metrics/stability_metrics_manager.h" | #include "components/arc/metrics/stability_metrics_manager.h" | ||||
#endif // defined(OS_CHROMEOS) | #endif // defined(OS_CHROMEOS) | ||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
+#if (defined(OS_BSD) || 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" | #include "chrome/browser/first_run/upgrade_util_linux.h" | ||||
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | ||||
#if defined(OS_LINUX) | #if defined(OS_LINUX) | ||||
#include "components/crash/content/app/breakpad_linux.h" | #include "components/crash/content/app/breakpad_linux.h" | ||||
@@ -260,7 +260,7 @@ | @@ -264,7 +264,7 @@ | ||||
#endif // defined(OS_WIN) | #endif // defined(OS_WIN) | ||||
#if defined(OS_WIN) || defined(OS_MACOSX) || \ | #if defined(OS_WIN) || defined(OS_MACOSX) || \ | ||||
- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | ||||
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) | + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) | ||||
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" | #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" | ||||
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h" | #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" | ||||
#endif | #endif | ||||
@@ -1071,7 +1071,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { | @@ -1073,7 +1073,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { | ||||
AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); | AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); | ||||
} | } | ||||
-#if defined(OS_MACOSX) || defined(OS_LINUX) | -#if defined(OS_MACOSX) || defined(OS_LINUX) | ||||
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) | ||||
// Create directory for user-level Native Messaging manifest files. This | // Create directory for user-level Native Messaging manifest files. This | ||||
// makes it less likely that the directory will be created by third-party | // makes it less likely that the directory will be created by third-party | ||||
// software with incorrect owner or permission. See crbug.com/725513 . | // software with incorrect owner or permission. See crbug.com/725513 . | ||||
@@ -1080,7 +1080,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { | @@ -1082,7 +1082,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { | ||||
&user_native_messaging_dir)); | &user_native_messaging_dir)); | ||||
if (!base::PathExists(user_native_messaging_dir)) | if (!base::PathExists(user_native_messaging_dir)) | ||||
base::CreateDirectory(user_native_messaging_dir); | base::CreateDirectory(user_native_messaging_dir); | ||||
-#endif // defined(OS_MACOSX) || defined(OS_LINUX) | -#endif // defined(OS_MACOSX) || defined(OS_LINUX) | ||||
+#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) | +#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) | ||||
} | } | ||||
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | ||||
@@ -1119,7 +1119,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { | @@ -1121,7 +1121,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { | ||||
} | } | ||||
#if defined(OS_WIN) || defined(OS_MACOSX) || \ | #if defined(OS_WIN) || defined(OS_MACOSX) || \ | ||||
- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) | ||||
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) | + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) | ||||
metrics::DesktopSessionDurationTracker::Initialize(); | metrics::DesktopSessionDurationTracker::Initialize(); | ||||
ProfileActivityMetricsRecorder::Initialize(); | ProfileActivityMetricsRecorder::Initialize(); | ||||
#endif | #endif | ||||
Show All 16 Lines |