mirror of
https://git.freebsd.org/ports.git
synced 2025-06-27 23:50:30 -04:00
2312775f8e
Submitted by: cpm Obtained from: https://github.com/cpu82/freebsd-chromium MFH: 2018Q1 Security: https://vuxml.freebsd.org/freebsd/e264e74e-ffe0-11e7-8b91-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/1d951e85-ffdb-11e7-8b91-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/82894193-ffd4-11e7-8b91-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/f8e72cd4-c66a-11e7-bb17-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/3cd46257-bbc5-11e7-a3bc-e8e0b747a45a.html Security: https://vuxml.freebsd.org/freebsd/a692bffe-b6ad-11e7-a1c2-e8e0b747a45a.html
52 lines
2 KiB
C++
52 lines
2 KiB
C++
--- chrome/browser/chrome_browser_main.cc.orig 2017-12-15 02:04:08.000000000 +0100
|
|
+++ chrome/browser/chrome_browser_main.cc 2017-12-24 00:42:50.301023000 +0100
|
|
@@ -193,7 +193,7 @@
|
|
#include "chrome/browser/offline_pages/offline_page_info_handler.h"
|
|
#endif
|
|
|
|
-#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)
|
|
|
|
@@ -287,7 +287,7 @@
|
|
#endif
|
|
|
|
#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
|
|
|
|
@@ -719,7 +719,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();
|
|
@@ -1122,11 +1122,11 @@
|
|
}
|
|
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
// Set the product channel for crash reports.
|
|
base::debug::SetCrashKeyValue(crash_keys::kChannel,
|
|
chrome::GetChannelString());
|
|
-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#endif // defined(OS_LINUX) || defined(OS_BSD)
|
|
|
|
#if defined(OS_MACOSX)
|
|
// Get the Keychain API to register for distributed notifications on the main
|
|
@@ -1327,7 +1327,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
|
|
|