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

Unified Diff: chrome/service/service_process.cc

Issue 6489031: Run event executor on the ui thread to remove the need to explicitly XFlush() the XTest calls. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removed unused gtk dependency. Created 9 years, 10 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
Index: chrome/service/service_process.cc
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
index be3e48ea679f9830e67a775344e5ca4a7050c55c..ff97081b611963eda5aa3fd65d4ee0a8500c2600 100644
--- a/chrome/service/service_process.cc
+++ b/chrome/service/service_process.cc
@@ -26,6 +26,10 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_switches.h"
+#if defined(TOOLKIT_USES_GTK)
+#include "ui/gfx/gtk_util.h"
+#endif
+
#if defined(ENABLE_REMOTING)
#include "chrome/service/remoting/chromoting_host_manager.h"
#endif // defined(ENABLED_REMOTING)
@@ -74,8 +78,11 @@ ServiceProcess::ServiceProcess()
g_service_process = this;
}
-bool ServiceProcess::Initialize(MessageLoop* message_loop,
+bool ServiceProcess::Initialize(MessageLoopForUI* message_loop,
const CommandLine& command_line) {
+#if defined(TOOLKIT_USES_GTK)
+ gfx::GtkInitFromCommandLine(command_line);
+#endif
main_message_loop_ = message_loop;
network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
base::Thread::Options options;

Powered by Google App Engine
This is Rietveld 408576698