Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index a84b87d964b6ff345e3022e9adaa6eee31444535..d5f88ee5d2ac9cec24d9670528c1f5f74a79911c 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -74,7 +74,7 @@ |
#include "ui/base/l10n/l10n_util_win.h" |
#endif |
-#if defined(OS_LINUX) || defined(OS_OPENBSD) |
+#if defined(OS_LINUX) || defined(OS_BSD) |
#include <glib-object.h> |
#endif |
@@ -88,7 +88,7 @@ |
#include "ui/gfx/gtk_util.h" |
#endif |
-#if defined(OS_POSIX) && !defined(OS_MACOSX) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) |
#include <sys/stat.h> |
#include "base/process_util.h" |
@@ -108,7 +108,8 @@ |
namespace content { |
namespace { |
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ |
+ !defined(OS_BSD) |
Paweł Hajdan Jr.
2013/05/29 21:19:26
Could you explain why? I'd rather get sandbox to w
|
void SetupSandbox(const CommandLine& parsed_command_line) { |
// TODO(evanm): move this into SandboxWrapper; I'm just trying to move this |
// code en masse out of chrome_main for now. |
@@ -136,7 +137,7 @@ void SetupSandbox(const CommandLine& parsed_command_line) { |
} |
#endif |
-#if defined(OS_LINUX) || defined(OS_OPENBSD) |
+#if defined(OS_LINUX) || defined(OS_BSD) |
static void GLibLogHandler(const gchar* log_domain, |
GLogLevelFlags log_level, |
const gchar* message, |
@@ -326,7 +327,8 @@ void BrowserMainLoop::EarlyInitialization() { |
crypto::EnsureNSPRInit(); |
#endif // !defined(USE_OPENSSL) |
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ |
+ !defined(OS_BSD) |
SetupSandbox(parsed_command_line_); |
#endif |
@@ -820,7 +822,7 @@ void BrowserMainLoop::InitializeToolkit() { |
// are no #else branches on any #ifs. |
// TODO(stevenjb): Move platform specific code into platform specific Parts |
// (Need to add InitializeToolkit stage to BrowserParts). |
-#if defined(OS_LINUX) || defined(OS_OPENBSD) |
+#if defined(OS_LINUX) || defined(OS_BSD) |
// g_type_init will be deprecated in 2.36. 2.35 is the development |
// version for 2.36, hence do not call g_type_init starting 2.35. |
// http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init |