diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 22:45:55 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 22:45:55 +0000 |
| commit | f0510a846663dcfd2bc656b84e63fe70eaf39667 (patch) | |
| tree | 7a793d32035b6e1c4ce24df35ebcf5402fd83f53 /chrome/browser/browser_theme_provider.cc | |
| parent | 569c5fe15cd205eeecadb95216d8a86d73c8519e (diff) | |
| download | chromium_src-f0510a846663dcfd2bc656b84e63fe70eaf39667.zip chromium_src-f0510a846663dcfd2bc656b84e63fe70eaf39667.tar.gz chromium_src-f0510a846663dcfd2bc656b84e63fe70eaf39667.tar.bz2 | |
Disable "Reset to Default Theme" button in Google Chrome Options / Personal Stuff when the default theme is already set.
This change is for the Mac OS; Windows change in a separate patch.
BUG= http://crbug.com/18585
TEST= Install a default theme, note that button is disabled. Install a non-default theme, note that button is enabled. Rinse, repeat.
Review URL: http://codereview.chromium.org/278004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_theme_provider.cc')
| -rw-r--r-- | chrome/browser/browser_theme_provider.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc index 85fcd15..44fb4d6 100644 --- a/chrome/browser/browser_theme_provider.cc +++ b/chrome/browser/browser_theme_provider.cc @@ -470,6 +470,13 @@ void BrowserThemeProvider::SetTheme(Extension* extension) { extension->path()); SetColorData(extension->GetThemeColors()); SetTintData(extension->GetThemeTints()); + + // Drop out to default theme if the theme data is empty. + if (images_.empty() && colors_.empty() && tints_.empty()) { + UseDefaultTheme(); + return; + } + SetDisplayPropertyData(extension->GetThemeDisplayProperties()); raw_data_.clear(); |