| Index: chrome/browser/extensions/extension_service.cc
|
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
|
| index 354a661b1e95d9ab7c56e1e8c87acae1218fdf22..f3999eaee59f1022814825e60d337be61caf7916 100644
|
| --- a/chrome/browser/extensions/extension_service.cc
|
| +++ b/chrome/browser/extensions/extension_service.cc
|
| @@ -809,9 +809,10 @@ bool ExtensionService::UninstallExtension(
|
|
|
| // Uninstalling one extension might have solved the problems of others.
|
| // Therefore, we clear warnings of this type for all extensions.
|
| - std::set<ExtensionWarningSet::WarningType> warnings;
|
| - extension_warnings_.GetWarningsAffectingExtension(extension_id, &warnings);
|
| - extension_warnings_.ClearWarnings(warnings);
|
| + std::set<ExtensionWarning::WarningType> warning_types;
|
| + extension_warnings_.GetWarningTypesAffectingExtension(extension_id,
|
| + &warning_types);
|
| + extension_warnings_.ClearWarnings(warning_types);
|
|
|
| return true;
|
| }
|
| @@ -910,9 +911,10 @@ void ExtensionService::DisableExtension(
|
|
|
| // Deactivating one extension might have solved the problems of others.
|
| // Therefore, we clear warnings of this type for all extensions.
|
| - std::set<ExtensionWarningSet::WarningType> warnings;
|
| - extension_warnings_.GetWarningsAffectingExtension(extension_id, &warnings);
|
| - extension_warnings_.ClearWarnings(warnings);
|
| + std::set<ExtensionWarning::WarningType> warning_types;
|
| + extension_warnings_.GetWarningTypesAffectingExtension(extension_id,
|
| + &warning_types);
|
| + extension_warnings_.ClearWarnings(warning_types);
|
| }
|
|
|
| void ExtensionService::GrantPermissionsAndEnableExtension(
|
|
|