| Index: content/browser/browser_main_loop.cc
|
| diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
|
| index 1c6b1a033ebb75395447ad15d59d8b2dd3c35984..fab9cfd92faf085f52d603b3aa9ee6f1fa6c30ab 100644
|
| --- a/content/browser/browser_main_loop.cc
|
| +++ b/content/browser/browser_main_loop.cc
|
| @@ -78,7 +78,8 @@
|
| #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) && \
|
| + !defined(OS_NACL)
|
| #include <glib-object.h>
|
| #endif
|
|
|
| @@ -165,7 +166,8 @@ 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) && \
|
| + !defined(OS_NACL)
|
| static void GLibLogHandler(const gchar* log_domain,
|
| GLogLevelFlags log_level,
|
| const gchar* message,
|
| @@ -903,7 +905,8 @@ 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) && \
|
| + !defined(OS_NACL)
|
| // 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
|
|
|