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

Unified Diff: base/test/test_suite.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 | « base/nix/mime_util_xdg.cc ('k') | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_suite.cc
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index 3416cd1dada43b4f46628e6e18f69c622e0cc5d8..7df146fc2465f2bcb9df8fc99e3be38984c9f6c4 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -31,7 +31,7 @@
#include "base/test/test_stub_android.h"
#endif
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
#include <gtk/gtk.h>
#endif
@@ -98,9 +98,9 @@ void TestSuite::PreInitialize(int argc, char** argv,
// have the locale set. In the absence of such a call the "C" locale is the
// default. In the gtk code (below) gtk_init() implicitly sets a locale.
setlocale(LC_ALL, "");
-#elif defined(TOOLKIT_USES_GTK)
+#elif defined(TOOLKIT_GTK)
gtk_init_check(&argc, &argv);
-#endif // defined(TOOLKIT_USES_GTK)
+#endif // defined(TOOLKIT_GTK)
if (create_at_exit_manager)
at_exit_manager_.reset(new base::AtExitManager);
« no previous file with comments | « base/nix/mime_util_xdg.cc ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698