diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-26 13:24:57 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-26 13:24:57 +0100 |
| commit | 68043e1e95eeb07d5cae7aca370b26518b0867d6 (patch) | |
| tree | cc6a216bce6aa9319a216327b73a07f49200dab5 /content/browser/browser_main_loop.cc | |
| parent | cede44592cfb9ec370925d10c2df733349a94a82 (diff) | |
| download | chromium_org-68043e1e95eeb07d5cae7aca370b26518b0867d6.tar.gz | |
Merge from Chromium at DEPS revision 225410
This commit was generated by merge_to_master.py.
Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index d543703dd6..14dd61410b 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 |