Chromium Code Reviews| Index: chrome/browser/themes/theme_service.cc |
| diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc |
| index cecfd45905cb8345fd607d00210d32e1533e012f..758b5d979109352beccf30e83201e03cf3c07049 100644 |
| --- a/chrome/browser/themes/theme_service.cc |
| +++ b/chrome/browser/themes/theme_service.cc |
| @@ -300,6 +300,7 @@ void ThemeService::Observe(int type, |
| case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: { |
| Details<const UnloadedExtensionInfo> unloaded_details(details); |
| if (unloaded_details->reason != UnloadedExtensionInfo::REASON_UPDATE && |
| + unloaded_details->reason != UnloadedExtensionInfo::REASON_LOCK_ALL && |
|
Mike Lerman
2014/11/21 17:00:13
We don't want to change the profile's theme if we'
|
| unloaded_details->extension->is_theme() && |
| unloaded_details->extension->id() == GetThemeID()) { |
| UseDefaultTheme(); |