| 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 5cda17a54906576808f6a87b0beb730859238b7a..dc2eb25493031d270d715d03e2a5eda59b05b166 100644
|
| --- a/chrome/browser/ui/app_list/extension_app_item.cc
|
| +++ b/chrome/browser/ui/app_list/extension_app_item.cc
|
| @@ -101,9 +101,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};
|
| @@ -194,7 +192,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;
|
| @@ -211,7 +210,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();
|
|
|