Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: extensions/browser/warning_service.cc

Issue 1146693004: [Extensions] Move remaining notifications out of ExtensionSettingsHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ben's Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/browser/warning_service.h ('k') | extensions/browser/warning_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/warning_service.cc
diff --git a/extensions/browser/warning_service.cc b/extensions/browser/warning_service.cc
index 11dc84c95d223ff1c0382577da14acd249b25330..8ba356aceab469c8715b164ab640c5487968893f 100644
--- a/extensions/browser/warning_service.cc
+++ b/extensions/browser/warning_service.cc
@@ -33,19 +33,19 @@ WarningService* WarningService::Get(content::BrowserContext* browser_context) {
void WarningService::ClearWarnings(
const std::set<Warning::WarningType>& types) {
DCHECK(CalledOnValidThread());
- bool deleted_anything = false;
+ ExtensionIdSet affected_extensions;
for (WarningSet::iterator i = warnings_.begin();
i != warnings_.end();) {
if (types.find(i->warning_type()) != types.end()) {
- deleted_anything = true;
+ affected_extensions.insert(i->extension_id());
warnings_.erase(i++);
} else {
++i;
}
}
- if (deleted_anything)
- NotifyWarningsChanged();
+ if (!affected_extensions.empty())
+ NotifyWarningsChanged(affected_extensions);
}
std::set<Warning::WarningType> WarningService::
@@ -78,12 +78,14 @@ std::vector<std::string> WarningService::GetWarningMessagesForExtension(
void WarningService::AddWarnings(const WarningSet& warnings) {
DCHECK(CalledOnValidThread());
- size_t old_size = warnings_.size();
- warnings_.insert(warnings.begin(), warnings.end());
-
- if (old_size != warnings_.size())
- NotifyWarningsChanged();
+ ExtensionIdSet affected_extensions;
+ for (const Warning& warning : warnings) {
+ if (warnings_.insert(warning).second)
+ affected_extensions.insert(warning.extension_id());
+ }
+ if (!affected_extensions.empty())
+ NotifyWarningsChanged(affected_extensions);
}
// static
@@ -113,8 +115,10 @@ void WarningService::RemoveObserver(Observer* observer) {
observer_list_.RemoveObserver(observer);
}
-void WarningService::NotifyWarningsChanged() {
- FOR_EACH_OBSERVER(Observer, observer_list_, ExtensionWarningsChanged());
+void WarningService::NotifyWarningsChanged(
+ const ExtensionIdSet& affected_extensions) {
+ FOR_EACH_OBSERVER(Observer, observer_list_,
+ ExtensionWarningsChanged(affected_extensions));
}
void WarningService::OnExtensionUnloaded(
« no previous file with comments | « extensions/browser/warning_service.h ('k') | extensions/browser/warning_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698