Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(946)

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 60009: ProxyConfigService for Linux.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/linux/system.gyp ('k') | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_dll_main.cc
===================================================================
--- chrome/app/chrome_dll_main.cc (revision 13925)
+++ chrome/app/chrome_dll_main.cc (working copy)
@@ -20,8 +20,10 @@
#endif
#if defined(OS_LINUX)
+#include <gdk/gdk.h>
+#include <glib.h>
+#include <gtk/gtk.h>
#include <string.h>
-#include <gtk/gtk.h>
#endif
#include "base/at_exit.h"
@@ -423,6 +425,15 @@
#endif
} else if (process_type.empty()) {
#if defined(OS_LINUX)
+ // Glib/GDK type system and threading initializations. Needed at
+ // least for gconf usage in net/proxy/proxy_config_service_linux.cc.
+ // TODO(sdoyon): confirm whether gconf truly needs this. If so,
+ // the GTK main loop (message pump) must also be made to call
+ // gdk_threads_enter/leave(). Similar issue with the clipboard
+ // (estade@ deanm@).
+ g_type_init();
+ g_thread_init(NULL);
+ gdk_threads_init();
// gtk_init() can change |argc| and |argv|, but nobody else uses them.
gtk_init(&argc, const_cast<char***>(&argv));
SetUpGLibLogHandler();
« no previous file with comments | « build/linux/system.gyp ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698