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

Unified Diff: chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thestig@'s comments. Created 6 years, 1 month 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/extensions/api/preference/chrome_direct_setting_api.cc
diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
index fe1325a7fd542088a97760455f01c7afa7ec2cff..93eb8d71037c2dc44986c0bc43aede07e69645b2 100644
--- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
+++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
@@ -11,9 +11,8 @@
#include "base/prefs/pref_service.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/extensions/api/preference/preference_api_constants.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
-#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_registry.h"
namespace extensions {
namespace chromedirectsetting {
@@ -137,12 +136,9 @@ void ChromeDirectSettingAPI::OnPrefChanged(
base::ListValue args;
args.Append(result.release());
- ExtensionService* extension_service =
- ExtensionSystem::Get(profile_)->extension_service();
- const ExtensionSet* extensions = extension_service->extensions();
- for (ExtensionSet::const_iterator it = extensions->begin();
- it != extensions->end(); ++it) {
- const std::string& extension_id = (*it)->id();
+ for (const scoped_refptr<const extensions::Extension>& extension :
+ ExtensionRegistry::Get(profile_)->enabled_extensions()) {
+ const std::string& extension_id = extension->id();
if (router->ExtensionHasEventListener(extension_id, event_name)) {
scoped_ptr<base::ListValue> args_copy(args.DeepCopy());
scoped_ptr<Event> event(new Event(event_name, args_copy.Pass()));

Powered by Google App Engine
This is Rietveld 408576698