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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile.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/process_singleton.h ('K') | « chrome/browser/process_singleton_aura.cc ('k') | chrome/browser/renderer_host/render_widget_host_view_views.h » ('j') | chrome/browser/renderer_host/render_widget_host_view_views.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile.cc
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 13fb35ff5d89a812f9dc7beb9b63b6fea5177bc0..b59fe4241cbb3a3cafacb6807b1d16f6ef36ba1a 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -62,7 +62,7 @@
#include "webkit/database/database_tracker.h"
#include "webkit/quota/quota_manager.h"
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)
#include "chrome/browser/ui/gtk/gtk_theme_service.h"
#endif
@@ -140,7 +140,7 @@ void Profile::RegisterUserPrefs(PrefService* prefs) {
prefs->RegisterBooleanPref(prefs::kSpeechInputCensorResults,
true,
PrefService::UNSYNCABLE_PREF);
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK) & !defined(USE_AURA)
prefs->RegisterBooleanPref(prefs::kUsesSystemTheme,
GtkThemeService::DefaultUsesSystemTheme(),
PrefService::UNSYNCABLE_PREF);
« chrome/browser/process_singleton.h ('K') | « chrome/browser/process_singleton_aura.cc ('k') | chrome/browser/renderer_host/render_widget_host_view_views.h » ('j') | chrome/browser/renderer_host/render_widget_host_view_views.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698