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

Unified Diff: chrome/browser/themes/theme_service_factory.cc

Issue 7973003: Making TOOLKIT_USES_GTK orthogonal to USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 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/browser/themes/theme_service.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service_factory.cc
diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc
index 21fa817268e56fe9e85a7af47b62f103f65aa52c..861614d0206ddc4a0a809502437c26be948cfe7b 100644
--- a/chrome/browser/themes/theme_service_factory.cc
+++ b/chrome/browser/themes/theme_service_factory.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/themes/theme_service.h"
#include "content/common/notification_service.h"
-#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
+#if defined(TOOLKIT_USES_GTK)
#include "chrome/browser/ui/gtk/gtk_theme_service.h"
#endif
@@ -45,7 +45,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {}
ProfileKeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
Profile* profile) const {
ThemeService* provider = NULL;
-#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
+#if defined(TOOLKIT_USES_GTK)
provider = new GtkThemeService;
#else
provider = new ThemeService;
« no previous file with comments | « chrome/browser/themes/theme_service.h ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698