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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: White spaces 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/browser/screensaver_window_finder_linux.cc ('K') | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/gtk/ssl_client_certificate_selector.cc » ('J')
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 861614d0206ddc4a0a809502437c26be948cfe7b..21fa817268e56fe9e85a7af47b62f103f65aa52c 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)
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
#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)
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
provider = new GtkThemeService;
#else
provider = new ThemeService;
« chrome/browser/screensaver_window_finder_linux.cc ('K') | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/browser.cc » ('j') | chrome/browser/ui/gtk/ssl_client_certificate_selector.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698