Index: chrome/browser/themes/theme_service.cc |
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc |
index fdb02441bd95d939b16997e1ef599ae63302035f..e24346d5f292a15bce2f91abfbdb74d5abe8aec0 100644 |
--- a/chrome/browser/themes/theme_service.cc |
+++ b/chrome/browser/themes/theme_service.cc |
@@ -474,8 +474,13 @@ void ThemeService::OnManagedUserInitialized() { |
// after the boolean flag has been set in |
// ProfileManager::InitProfileUserPrefs() and after the |
// NOTIFICATION_EXTENSIONS_READY notification is sent. |
- if (theme_supplier_.get() || !IsManagedUser()) |
+ if ((theme_supplier_.get() && |
+ (theme_supplier_->get_theme_type() == CustomThemeSupplier::EXTENSION || |
+ theme_supplier_->get_theme_type() == |
+ CustomThemeSupplier::MANAGED_USER_THEME)) || |
+ !IsManagedUser()) { |
return; |
+ } |
SetManagedUserTheme(); |
} |