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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/browser_main.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflict resolved 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
« chrome/common/render_messages.h ('K') | « chrome/common/render_messages.h ('k') | content/browser/gpu/gpu_process_host.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 639e901a3e3ed4257df0d2065374adf4a6976c17..7a018df01a15153a2db3e70f5b01bf2548abefb4 100644
--- a/content/browser/browser_main.cc
+++ b/content/browser/browser_main.cc
@@ -291,7 +291,9 @@ void BrowserMainParts::InitializeToolkit() {
// TODO(satorux, stevenjb): remove this once it is no longer needed.
dbus_g_thread_init();
#endif
+#if !defined(USE_AURA)
gfx::GtkInitFromCommandLine(parameters().command_line_);
+#endif
SetUpGLibLogHandler();
#endif
« chrome/common/render_messages.h ('K') | « chrome/common/render_messages.h ('k') | content/browser/gpu/gpu_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698