| 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..28cdc80addfdf4efbc7f5fecda90640361862e93 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,8 @@ void ExtensionService::DisableUserExtensions(
|
|
|
| for (extensions::ExtensionList::const_iterator extension = to_disable.begin();
|
| extension != to_disable.end(); ++extension) {
|
| + if (type_filter.end() == type_filter.find((*extension)->GetType()))
|
| + 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);
|
|
|