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 76833fdedca1395e6f0a38c10f664dac417d1781..94b4edd3395be5b6062675a83237437b02a521e3 100644 |
--- a/chrome/browser/ui/app_list/recommended_apps.cc |
+++ b/chrome/browser/ui/app_list/recommended_apps.cc |
@@ -8,16 +8,13 @@ |
#include <vector> |
#include "base/bind.h" |
-#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/extensions/install_tracker.h" |
#include "chrome/browser/extensions/install_tracker_factory.h" |
#include "chrome/browser/profiles/profile.h" |
#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_system.h" |
-#include "extensions/browser/extension_system_provider.h" |
-#include "extensions/browser/extensions_browser_client.h" |
+#include "extensions/browser/extension_registry.h" |
#include "extensions/browser/pref_names.h" |
#include "extensions/common/extension.h" |
#include "extensions/common/extension_set.h" |
@@ -45,9 +42,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, |
@@ -70,14 +65,14 @@ 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; |