Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index d543703dd67bd71aa92fbad40775b64b1c68da1e..14dd61410bcce3cde6d9237e4f554c94c85234f9 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -82,7 +82,7 @@ |
#include "ui/base/l10n/l10n_util_win.h" |
#endif |
-#if defined(OS_LINUX) || defined(OS_OPENBSD) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
#include <glib-object.h> |
#endif |
@@ -175,7 +175,7 @@ void SetupSandbox(const CommandLine& parsed_command_line) { |
} |
#endif |
-#if defined(OS_LINUX) || defined(OS_OPENBSD) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
static void GLibLogHandler(const gchar* log_domain, |
GLogLevelFlags log_level, |
const gchar* message, |
@@ -994,7 +994,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_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
// 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 |