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

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

Issue 615493005: c/b/supervised_user: Use range-based for where appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix CrOS Created 6 years, 3 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
Index: chrome/browser/supervised_user/supervised_user_service.cc
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index 6cd213090fbda233dc55580f9fb306a4ed8a8f9f..ede100c6c94d7ece7f54f6c21404a6b3e2818d41 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -100,12 +100,11 @@ void SupervisedUserService::URLFilterContext::LoadWhitelists(
ScopedVector<SupervisedUserSiteList> site_lists) {
// SupervisedUserURLFilter::LoadWhitelists takes ownership of |site_lists|,
// so we make an additional copy of it.
- /// TODO(bauerb): This is kinda ugly.
+ // TODO(bauerb): This is kinda ugly.
ScopedVector<SupervisedUserSiteList> site_lists_copy;
- for (ScopedVector<SupervisedUserSiteList>::iterator it = site_lists.begin();
- it != site_lists.end(); ++it) {
- site_lists_copy.push_back((*it)->Clone());
- }
+ for (const SupervisedUserSiteList* site_list : site_lists)
+ site_lists_copy.push_back(site_list->Clone());
+
ui_url_filter_->LoadWhitelists(site_lists.Pass());
BrowserThread::PostTask(
BrowserThread::IO,
@@ -313,11 +312,8 @@ void SupervisedUserService::AddNavigationBlockedCallback(
void SupervisedUserService::DidBlockNavigation(
content::WebContents* web_contents) {
- for (std::vector<NavigationBlockedCallback>::iterator it =
- navigation_blocked_callbacks_.begin();
- it != navigation_blocked_callbacks_.end(); ++it) {
- it->Run(web_contents);
- }
+ for (const auto& callback : navigation_blocked_callbacks_)
+ callback.Run(web_contents);
}
void SupervisedUserService::AddObserver(
@@ -495,15 +491,13 @@ SupervisedUserService::GetActiveSiteLists() {
if (!extension_service)
return site_lists.Pass();
- const extensions::ExtensionSet* extensions = extension_service->extensions();
- for (extensions::ExtensionSet::const_iterator it = extensions->begin();
- it != extensions->end(); ++it) {
- const extensions::Extension* extension = it->get();
+ for (const scoped_refptr<const extensions::Extension>& extension :
+ *extension_service->extensions()) {
if (!extension_service->IsExtensionEnabled(extension->id()))
continue;
extensions::ExtensionResource site_list =
- extensions::SupervisedUserInfo::GetContentPackSiteList(extension);
+ extensions::SupervisedUserInfo::GetContentPackSiteList(extension.get());
if (!site_list.empty()) {
site_lists.push_back(new SupervisedUserSiteList(extension->id(),
site_list.GetFilePath()));

Powered by Google App Engine
This is Rietveld 408576698