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

Unified Diff: content/browser/browser_main.cc

Issue 7943006: Initialize message pump not to use gtk. WindowSizer for aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing file Created 9 years, 3 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 | « chrome/chrome_browser.gypi ('k') | ui/aura/desktop.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main.cc
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc
index b2ba07da311f2b2f60ee6401d409fc454352202f..9171a01e71173e8521925beb9780decbad974cdb 100644
--- a/content/browser/browser_main.cc
+++ b/content/browser/browser_main.cc
@@ -292,8 +292,8 @@ void BrowserMainParts::InitializeToolkit() {
dbus_g_thread_init();
#endif
#if defined(USE_AURA)
- // TODO(saintlou): We still need some GTK at the lowest level, so init here.
- gtk_init(NULL, NULL);
+ // TODO(oshima|saintlou): Remove this once we remove gtk from build
+ base::MessagePumpX::DisableGtkMessagePump();
#else
gfx::GtkInitFromCommandLine(parameters().command_line_);
#endif
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | ui/aura/desktop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698