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

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

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix UserScriptListenerTests.MultiProfile 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/extension_app_item.cc
diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc
index 690a3e8d6e8297ebe1ee328759129e8d35f58ff0..791a72ad8ed670662a0584c61bf9f17c22abc0d4 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -104,9 +104,7 @@ class RoundedCornersImageSource : public gfx::CanvasImageSource {
};
extensions::AppSorting* GetAppSorting(Profile* profile) {
- ExtensionService* service =
- extensions::ExtensionSystem::Get(profile)->extension_service();
- return service->extension_prefs()->app_sorting();
+ return extensions::ExtensionPrefs::Get(profile)->app_sorting();
}
const color_utils::HSL shift = {-1, 0, 0.6};
@@ -155,12 +153,11 @@ bool ExtensionAppItem::NeedsOverlay() const {
if (!streamlined_hosted_apps)
return false;
#endif
- const ExtensionService* service =
- extensions::ExtensionSystem::Get(profile_)->extension_service();
-
- extensions::LaunchType launch_type = GetExtension()
- ? extensions::GetLaunchType(service->extension_prefs(), GetExtension())
- : extensions::LAUNCH_TYPE_WINDOW;
+ extensions::LaunchType launch_type =
+ GetExtension()
+ ? extensions::GetLaunchType(extensions::ExtensionPrefs::Get(profile_),
+ GetExtension())
+ : extensions::LAUNCH_TYPE_WINDOW;
return !is_platform_app_ && extension_id_ != extension_misc::kChromeAppId &&
(!streamlined_hosted_apps ||
@@ -217,7 +214,8 @@ void ExtensionAppItem::Move(const ExtensionAppItem* prev,
ExtensionService* service =
extensions::ExtensionSystem::Get(profile_)->extension_service();
- extensions::AppSorting* sorting = service->extension_prefs()->app_sorting();
+ extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);
+ extensions::AppSorting* sorting = GetAppSorting(profile_);
syncer::StringOrdinal page;
std::string prev_id, next_id;
@@ -234,7 +232,7 @@ void ExtensionAppItem::Move(const ExtensionAppItem* prev,
if (page.Equals(sorting->GetPageOrdinal(next->extension_id())))
next_id = next->extension_id();
}
- service->extension_prefs()->SetAppDraggedByUser(extension_id_);
+ prefs->SetAppDraggedByUser(extension_id_);
sorting->SetPageOrdinal(extension_id_, page);
service->OnExtensionMoved(extension_id_, prev_id, next_id);
UpdatePositionFromExtensionOrdering();
« no previous file with comments | « chrome/browser/ui/app_list/app_list_syncable_service.cc ('k') | chrome/browser/ui/app_list/extension_app_model_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698