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

Unified Diff: chrome/browser/ui/gtk/gtk_theme_service.cc

Issue 6992084: Disallow gtk theme on cros (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/gtk_theme_service.cc
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc
index 21122057149531d83e0eadac125fd4284923cceb..035032ddaed209e7dda042f1c800ff3fd9173682 100644
--- a/chrome/browser/ui/gtk/gtk_theme_service.cc
+++ b/chrome/browser/ui/gtk/gtk_theme_service.cc
@@ -290,8 +290,11 @@ GtkThemeService::~GtkThemeService() {
void GtkThemeService::Init(Profile* profile) {
registrar_.Init(profile->GetPrefs());
registrar_.Add(prefs::kUsesSystemTheme, this);
+#if defined(OS_CHROMEOS)
+ use_gtk_ = false;
+#else
use_gtk_ = profile->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
-
+#endif
ThemeService::Init(profile);
}
@@ -366,7 +369,9 @@ void GtkThemeService::Observe(NotificationType type,
const NotificationDetails& details) {
if ((type == NotificationType::PREF_CHANGED) &&
(*Details<std::string>(details).ptr() == prefs::kUsesSystemTheme)) {
+#if !defined(OS_CHROMEOS)
use_gtk_ = profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
+#endif
} else {
ThemeService::Observe(type, source, details);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698