1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- chrome/browser/chrome_browser_main.cc.orig 2017-06-05 19:03:02 UTC
+++ chrome/browser/chrome_browser_main.cc
@@ -183,7 +183,7 @@
#include "chrome/browser/feedback/feedback_profile_observer.h"
#endif // defined(OS_ANDROID)
-#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)
@@ -274,7 +274,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
@@ -477,9 +477,9 @@ void RegisterComponentsForUpdate() {
#if !defined(OS_ANDROID)
RegisterPepperFlashComponent(cus);
-#if !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
RegisterWidevineCdmComponent(cus);
-#endif // !defined(OS_CHROMEOS)
+#endif // !defined(OS_CHROMEOS) && !defined(OS_BSD)
#endif // !defined(OS_ANDROID)
#if !defined(DISABLE_NACL) && !defined(OS_ANDROID)
@@ -761,7 +761,7 @@ void ChromeBrowserMainParts::SetupFieldTrials() {
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();
@@ -1191,11 +1191,11 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#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)
// Initialize tracking synchronizer system.
tracking_synchronizer_ = new metrics::TrackingSynchronizer(
@@ -1374,7 +1374,7 @@ void ChromeBrowserMainParts::PreBrowserStart() {
// 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
|
