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

Unified Diff: chrome/browser/supervised_user/supervised_user_whitelist_service.cc

Issue 875423002: Don't notify existing observers in SupervisedUserWhitelistService::AddSiteListsChangedCallback(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: typo Created 5 years, 11 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 | « chrome/browser/supervised_user/supervised_user_whitelist_service.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/supervised_user/supervised_user_whitelist_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
index 07914be641052bfc9467110acd363d4d3c127647..89c0d015d4550c92e150e7acfcc9d1f6e73a409c 100644
--- a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
@@ -86,7 +86,10 @@ void SupervisedUserWhitelistService::Init() {
void SupervisedUserWhitelistService::AddSiteListsChangedCallback(
const SiteListsChangedCallback& callback) {
site_lists_changed_callbacks_.push_back(callback);
- NotifyWhitelistsChanged();
+
+ std::vector<scoped_refptr<SupervisedUserSiteList>> whitelists;
+ GetLoadedWhitelists(&whitelists);
+ callback.Run(whitelists);
}
void SupervisedUserWhitelistService::LoadWhitelistForTesting(
@@ -287,10 +290,15 @@ void SupervisedUserWhitelistService::RegisterWhitelist(const std::string& id,
weak_ptr_factory_.GetWeakPtr(), id));
}
-void SupervisedUserWhitelistService::NotifyWhitelistsChanged() {
- std::vector<scoped_refptr<SupervisedUserSiteList> > whitelists;
+void SupervisedUserWhitelistService::GetLoadedWhitelists(
+ std::vector<scoped_refptr<SupervisedUserSiteList>>* whitelists) {
for (const auto& whitelist : loaded_whitelists_)
- whitelists.push_back(whitelist.second);
+ whitelists->push_back(whitelist.second);
+}
+
+void SupervisedUserWhitelistService::NotifyWhitelistsChanged() {
+ std::vector<scoped_refptr<SupervisedUserSiteList>> whitelists;
+ GetLoadedWhitelists(&whitelists);
for (const auto& callback : site_lists_changed_callbacks_)
callback.Run(whitelists);
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_whitelist_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698