Chromium Code Reviews| Index: chrome/browser/extensions/extension_service.cc |
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc |
| index 42cb3fa69ea9ea451229871e5df976d830fb9cd7..13e32240d8a7183213d076427a48d1c9ec6e34f3 100644 |
| --- a/chrome/browser/extensions/extension_service.cc |
| +++ b/chrome/browser/extensions/extension_service.cc |
| @@ -977,6 +977,7 @@ void ExtensionService::DisableExtension( |
| } |
| void ExtensionService::DisableUserExtensions( |
| + const std::set<extensions::Manifest::Type> type_filter, |
| const std::vector<std::string>& except_ids) { |
| extensions::ManagementPolicy* management_policy = |
| system_->management_policy(); |
| @@ -995,6 +996,9 @@ void ExtensionService::DisableUserExtensions( |
| for (extensions::ExtensionList::const_iterator extension = to_disable.begin(); |
| extension != to_disable.end(); ++extension) { |
| + if (!(*extension)->manifest() || |
|
vasilii
2013/08/02 09:32:04
I don't think it's possible.
battre
2013/08/02 10:36:21
Me neither, but I don't want to merge a crasher in
|
| + type_filter.end() == type_filter.find((*extension)->manifest()->type())) |
|
vasilii
2013/08/02 09:32:04
(*extension)->GetType()?
battre
2013/08/02 10:36:21
Done.
|
| + continue; |
| const std::string& id = (*extension)->id(); |
| if (except_ids.end() == std::find(except_ids.begin(), except_ids.end(), id)) |
| DisableExtension(id, extensions::Extension::DISABLE_USER_ACTION); |