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

Unified Diff: chrome/service/service_process.cc

Issue 9969080: Remove TOOLKIT_USES_GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add gtk dependency to android linux host Created 8 years, 9 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/common/pref_names.cc ('k') | chrome/test/perf/feature_startup_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/service/service_process.cc
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
index d747c93c72f13d06095633bead046f6b50d9ab62..12307160965f9a0bbe4aa167b0df59152eaccea3 100644
--- a/chrome/service/service_process.cc
+++ b/chrome/service/service_process.cc
@@ -34,7 +34,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_switches.h"
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
#include "ui/gfx/gtk_util.h"
#include <gtk/gtk.h>
#endif
@@ -124,7 +124,7 @@ ServiceProcess::ServiceProcess()
bool ServiceProcess::Initialize(MessageLoopForUI* message_loop,
const CommandLine& command_line,
ServiceProcessState* state) {
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
// TODO(jamiewalch): Calling GtkInitFromCommandLine here causes the process
// to abort if run headless. The correct fix for this is to refactor the
// service process to be more modular, a task that is currently underway.
« no previous file with comments | « chrome/common/pref_names.cc ('k') | chrome/test/perf/feature_startup_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698