mirror of
https://git.freebsd.org/ports.git
synced 2025-06-28 08:00:31 -04:00
c9a6ed3a28
Changelog: https://chromium.googlesource.com/chromium/src/+log/64.0.3282.186..65.0.3325.181?pretty=fuller&n=10000 MFH: 2018Q1 Security: https://vuxml.freebsd.org/freebsd/555af074-22b9-11e8-9799-54ee754af08e.html Security: https://vuxml.freebsd.org/freebsd/3ae21918-31e3-11e8-927b-e8e0b747a45a.html
47 lines
1.8 KiB
C++
47 lines
1.8 KiB
C++
--- chrome/browser/chrome_browser_main.cc.orig 2018-03-20 23:05:16.000000000 +0100
|
|
+++ chrome/browser/chrome_browser_main.cc 2018-03-24 22:37:46.110352000 +0100
|
|
@@ -206,7 +206,7 @@
|
|
#include "chromeos/settings/cros_settings_names.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)
|
|
|
|
@@ -244,7 +244,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
|
|
|
|
@@ -737,7 +737,7 @@
|
|
field_trial_synchronizer_ = new FieldTrialSynchronizer();
|
|
|
|
#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();
|
|
@@ -1145,7 +1145,7 @@
|
|
}
|
|
#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::GetChannelString());
|
|
#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
@@ -1351,7 +1351,7 @@
|
|
|
|
// Start the tab manager here so that we give the most amount of time for the
|
|
// other services to start up before we start adjusting the oom priority.
|
|
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
|
|
+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
|
|
g_browser_process->GetTabManager()->Start();
|
|
#endif
|
|
|