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

Unified Diff: chrome/browser/ui/app_list/recommended_apps.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional cleanup Created 6 years, 10 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/ui/app_list/recommended_apps.cc
diff --git a/chrome/browser/ui/app_list/recommended_apps.cc b/chrome/browser/ui/app_list/recommended_apps.cc
index 1d5c796113c420203ddbbaaa033fe67ed07c92a6..0c588b4021cda64820c70c8b71ac7dca2df4acee 100644
--- a/chrome/browser/ui/app_list/recommended_apps.cc
+++ b/chrome/browser/ui/app_list/recommended_apps.cc
@@ -8,7 +8,6 @@
#include <vector>
#include "base/bind.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/install_tracker.h"
#include "chrome/browser/extensions/install_tracker_factory.h"
@@ -16,6 +15,7 @@
#include "chrome/browser/ui/app_list/recommended_apps_observer.h"
#include "chrome/common/pref_names.h"
#include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/browser/pref_names.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_set.h"
@@ -43,9 +43,7 @@ bool AppLaunchedMoreRecent(const AppSortInfo& app1, const AppSortInfo& app2) {
RecommendedApps::RecommendedApps(Profile* profile) : profile_(profile) {
extensions::InstallTrackerFactory::GetForProfile(profile_)->AddObserver(this);
- ExtensionService* service =
- extensions::ExtensionSystem::Get(profile_)->extension_service();
- extensions::ExtensionPrefs* prefs = service->extension_prefs();
+ extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);
pref_change_registrar_.Init(prefs->pref_service());
pref_change_registrar_.Add(extensions::pref_names::kExtensions,
base::Bind(&RecommendedApps::Update,
@@ -68,14 +66,13 @@ void RecommendedApps::RemoveObserver(RecommendedAppsObserver* observer) {
}
void RecommendedApps::Update() {
- ExtensionService* service =
- extensions::ExtensionSystem::Get(profile_)->extension_service();
- extensions::ExtensionPrefs* prefs = service->extension_prefs();
+ extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);
std::vector<AppSortInfo> sorted_apps;
- const extensions::ExtensionSet* extensions = service->extensions();
- for (extensions::ExtensionSet::const_iterator app = extensions->begin();
- app != extensions->end(); ++app) {
+ const extensions::ExtensionSet& extensions =
+ extensions::ExtensionRegistry::Get(profile_)->enabled_extensions();
+ for (extensions::ExtensionSet::const_iterator app = extensions.begin();
+ app != extensions.end(); ++app) {
if (!(*app)->ShouldDisplayInAppLauncher())
continue;

Powered by Google App Engine
This is Rietveld 408576698