| Index: chrome/browser/extensions/extension_warning_badge_service.cc
|
| diff --git a/chrome/browser/extensions/extension_warning_badge_service.cc b/chrome/browser/extensions/extension_warning_badge_service.cc
|
| index 7aa6bbc537e6a80a8847901e016d970a87c73e90..b34ad6bd0091e95522e59716c79119989c15a5dd 100644
|
| --- a/chrome/browser/extensions/extension_warning_badge_service.cc
|
| +++ b/chrome/browser/extensions/extension_warning_badge_service.cc
|
| @@ -99,15 +99,14 @@ void ExtensionWarningBadgeService::SuppressCurrentWarnings() {
|
| DCHECK(CalledOnValidThread());
|
| size_t old_size = suppressed_warnings_.size();
|
|
|
| - const ExtensionWarningSet& warnings = GetCurrentWarnings();
|
| + const WarningSet& warnings = GetCurrentWarnings();
|
| suppressed_warnings_.insert(warnings.begin(), warnings.end());
|
|
|
| if (old_size != suppressed_warnings_.size())
|
| UpdateBadgeStatus();
|
| }
|
|
|
| -const ExtensionWarningSet&
|
| -ExtensionWarningBadgeService::GetCurrentWarnings() const {
|
| +const WarningSet& ExtensionWarningBadgeService::GetCurrentWarnings() const {
|
| return ExtensionSystem::Get(profile_)->warning_service()->warnings();
|
| }
|
|
|
| @@ -117,9 +116,9 @@ void ExtensionWarningBadgeService::ExtensionWarningsChanged() {
|
| }
|
|
|
| void ExtensionWarningBadgeService::UpdateBadgeStatus() {
|
| - const std::set<ExtensionWarning>& warnings = GetCurrentWarnings();
|
| + const std::set<Warning>& warnings = GetCurrentWarnings();
|
| bool non_suppressed_warnings_exist = false;
|
| - for (std::set<ExtensionWarning>::const_iterator i = warnings.begin();
|
| + for (std::set<Warning>::const_iterator i = warnings.begin();
|
| i != warnings.end(); ++i) {
|
| if (!ContainsKey(suppressed_warnings_, *i)) {
|
| non_suppressed_warnings_exist = true;
|
|
|