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

Unified Diff: chrome/browser/themes/theme_service.cc

Issue 22796002: Check if the theme supplier is an extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Check theme type. Created 7 years, 4 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/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();
}
« 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