diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 22:43:15 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 22:43:15 +0000 |
| commit | 7ec831e83a9858a2fcc75fb7127bf7aa394ca4bc (patch) | |
| tree | 60020bdb2f559021b954571931cc528cbca21580 /chrome/browser/ui/gtk | |
| parent | 527089be7f4e9631ce19fffa56784981cc6f8135 (diff) | |
| download | chromium_src-7ec831e83a9858a2fcc75fb7127bf7aa394ca4bc.zip chromium_src-7ec831e83a9858a2fcc75fb7127bf7aa394ca4bc.tar.gz chromium_src-7ec831e83a9858a2fcc75fb7127bf7aa394ca4bc.tar.bz2 | |
Disallow gtk theme on cros
BUG=chromium-os:15686
TEST=None
Review URL: http://codereview.chromium.org/6992084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk')
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_theme_service.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc index 671af71..0e69ecd 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service.cc @@ -291,8 +291,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); } @@ -367,7 +370,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); } |