Index: chrome/browser/themes/theme_service.cc |
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc |
index ce5843d3c66c92277f0b9acd2ab13a318fb02b71..308cd9bff3ae4f8b7f1d8e35afa5e41f39237056 100644 |
--- a/chrome/browser/themes/theme_service.cc |
+++ b/chrome/browser/themes/theme_service.cc |
@@ -81,9 +81,9 @@ void WritePackToDiskCallback(BrowserThemePack* pack, |
} // namespace |
ThemeService::ThemeService() |
- : rb_(ResourceBundle::GetSharedInstance()), |
+ : ready_(false), |
+ rb_(ResourceBundle::GetSharedInstance()), |
profile_(NULL), |
- ready_(false), |
installed_pending_load_id_(kDefaultThemeID), |
number_of_infobars_(0), |
weak_ptr_factory_(this) { |
@@ -343,10 +343,8 @@ void ThemeService::UseDefaultTheme() { |
SetManagedUserTheme(); |
return; |
} |
- if (ready_) { |
- ClearAllThemeData(); |
- NotifyThemeChanged(); |
- } |
+ ClearAllThemeData(); |
+ NotifyThemeChanged(); |
} |
void ThemeService::SetNativeTheme() { |
@@ -378,6 +376,9 @@ color_utils::HSL ThemeService::GetTint(int id) const { |
} |
void ThemeService::ClearAllThemeData() { |
+ if (!ready_) |
+ return; |
+ |
SwapThemeSupplier(NULL); |
// Clear our image cache. |