blob: dacfafc5063581904546a4a692907b575e3e1e26 (
plain) (
blame)
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
|
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2017-06-05 19:03:03 UTC
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -29,7 +29,7 @@
#include "ui/wm/core/wm_state.h"
#endif // defined(USE_AURA)
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@@ -40,7 +40,7 @@
#include "chrome/grit/generated_resources.h"
#include "content/public/common/content_switches.h"
#include "ui/base/l10n/l10n_util.h"
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/ash_config.h"
@@ -99,7 +99,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
IMEDriver::Register();
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
// On the Linux desktop, we want to prevent the user from logging in as root,
// so that we don't destroy the profile. Now that we have some minimal ui
// initialized, check to see if we're running as root and bail if we are.
@@ -130,7 +130,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit(
base::RunLoop().RunUntilIdle();
exit(EXIT_FAILURE);
-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
}
void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted(
|
