Initialize glib for all linux variants

content/browser/browser_main.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/browser_main.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
 #include <commctrl.h>
 #include <ole2.h>
 #include <shellapi.h>
 
 #include "base/win/scoped_com_initializer.h"
 #include "net/base/winsock_init.h"
 #include "sandbox/src/sandbox.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #endif
 
+#if defined(OS_LINUX)
+#include <glib-object.h>
+#endif
+
 #if defined(OS_CHROMEOS)
 #include <dbus/dbus-glib.h>
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/stat.h>
 
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/browser/zygote_host_linux.h"
 #endif
@@ skipping 46 matching lines @@
     sandbox_cmd = sandbox_binary;
 
   // Tickle the sandbox host and zygote host so they fork now.
   RenderSandboxHostLinux* shost = RenderSandboxHostLinux::GetInstance();
   shost->Init(sandbox_cmd);
   ZygoteHost* zhost = ZygoteHost::GetInstance();
   zhost->Init(sandbox_cmd);
 }
 #endif
 
-#if defined(TOOLKIT_USES_GTK)
+#if defined(OS_LINUX)
 static void GLibLogHandler(const gchar* log_domain,
                            GLogLevelFlags log_level,
                            const gchar* message,
                            gpointer userdata) {
   if (!log_domain)
     log_domain = "<unknown>";
   if (!message)
     message = "<no message>";
 
   if (strstr(message, "Loading IM context type") ||
@@ skipping 151 matching lines @@
   // Register the main thread by instantiating it, but don't call any methods.
   main_thread_.reset(new BrowserThread(BrowserThread::UI,
                                        MessageLoop::current()));
 }
 
 void BrowserMainParts::InitializeToolkit() {
   // TODO(evan): this function is rather subtle, due to the variety
   // of intersecting ifdefs we have.  To keep it easy to follow, there
   // are no #else branches on any #ifs.
 
-#if defined(TOOLKIT_USES_GTK)
+#if defined(OS_LINUX)
   // We want to call g_thread_init(), but in some codepaths (tests) it
   // is possible it has already been called.  In older versions of
   // GTK, it is an error to call g_thread_init twice; unfortunately,
   // the API to tell whether it has been called already was also only
   // added in a newer version of GTK!  Thankfully, this non-intuitive
   // check is actually equivalent and sufficient to work around the
   // error.
   if (!g_thread_supported())
     g_thread_init(NULL);
   // Glib type system initialization. Needed at least for gconf,
   // used in net/proxy/proxy_config_service_linux.cc. Most likely
   // this is superfluous as gtk_init() ought to do this. It's
   // definitely harmless, so retained as a reminder of this
   // requirement for gconf.
   g_type_init();
 #if defined(OS_CHROMEOS)
   // ChromeOS still uses dbus-glib, so initialize its threading here.
   // TODO(satorux, stevenjb): remove this once it is no longer needed.
   dbus_g_thread_init();
 #endif
-#if defined(USE_AURA)
-  // TODO(oshima|saintlou): Remove this once we remove gtk from build
-  base::MessagePumpX::DisableGtkMessagePump();
-#else
+#if !defined(USE_AURA)
   gfx::GtkInitFromCommandLine(parameters().command_line_);
 #endif
   SetUpGLibLogHandler();
 #endif
 
 #if defined(TOOLKIT_GTK)
   // It is important for this to happen before the first run dialog, as it
   // styles the dialog as well.
   gfx::InitRCStyles();
 #endif
@@ skipping 105 matching lines @@
   base::win::ScopedCOMInitializer com_initializer;
 #endif  // OS_WIN
 
   base::StatisticsRecorder statistics;
 
   parts->RunMainMessageLoopParts();
 
   TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
   return parts->result_code();
 }