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

Unified Diff: chrome/browser/notifications/message_center_settings_controller.cc

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years 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/notifications/message_center_settings_controller.cc
diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc
index 4d35d2cab99f5a0b8dd7e311ee8f8aa7e5b96ce5..cc444605a791727045e326bab2978dab0f876add 100644
--- a/chrome/browser/notifications/message_center_settings_controller.cc
+++ b/chrome/browser/notifications/message_center_settings_controller.cc
@@ -192,7 +192,8 @@ void MessageCenterSettingsController::GetNotifierList(
comparator.reset(new NotifierComparator(collator.get()));
ExtensionService* extension_service = profile->GetExtensionService();
- const ExtensionSet* extension_set = extension_service->extensions();
+ const extensions::ExtensionSet* extension_set =
+ extension_service->extensions();
// The extension icon size has to be 32x32 at least to load bigger icons if
// the icon doesn't exist for the specified size, and in that case it falls
// back to the default icon. The fetched icon will be resized in the settings
@@ -200,7 +201,7 @@ void MessageCenterSettingsController::GetNotifierList(
// crbug.com/222931
app_icon_loader_.reset(new extensions::AppIconLoaderImpl(
profile, extension_misc::EXTENSION_ICON_SMALL, this));
- for (ExtensionSet::const_iterator iter = extension_set->begin();
+ for (extensions::ExtensionSet::const_iterator iter = extension_set->begin();
iter != extension_set->end();
++iter) {
const extensions::Extension* extension = iter->get();
« no previous file with comments | « chrome/browser/notifications/message_center_notification_manager.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698