Separate the NTP app ordering from the app list app ordering

chrome/browser/ui/app_list/extension_app_item.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 
 #include "base/prefs/pref_service.h"
+#include "chrome/browser/extensions/app_list_extension_ordering.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_context_menu.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
@@ skipping 27 matching lines @@
     const gfx::ImageSkia& overlay = *ui::ResourceBundle::GetSharedInstance().
         GetImageSkiaNamed(IDR_APP_LIST_TAB_OVERLAY);
     canvas->DrawImageInt(overlay, 0, icon_.height() - overlay.height());
   }
 
   gfx::ImageSkia icon_;
 
   DISALLOW_COPY_AND_ASSIGN(ShortcutOverlayImageSource);
 };
 
-ExtensionSorting* GetExtensionSorting(Profile* profile) {
+AppListExtensionOrdering* GetExtensionOrdering(Profile* profile) {
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
-  return service->extension_prefs()->extension_sorting();
+  return service->extension_prefs()->app_list_extension_ordering();
 }
 
 const color_utils::HSL shift = {-1, 0, 0.6};
 
 }  // namespace
 
 ExtensionAppItem::ExtensionAppItem(Profile* profile,
                                    const std::string& extension_id,
                                    AppListControllerDelegate* controller,
                                    const std::string& extension_name,
                                    const gfx::ImageSkia& installing_icon,
                                    bool is_platform_app)
     : ChromeAppListItem(TYPE_APP),
       profile_(profile),
       extension_id_(extension_id),
       controller_(controller),
       extension_name_(extension_name),
       installing_icon_(
           gfx::ImageSkiaOperations::CreateHSLShiftedImage(installing_icon,
                                                           shift)),
       is_platform_app_(is_platform_app) {
   Reload();
-  GetExtensionSorting(profile_)->EnsureValidOrdinals(extension_id_,
-                                                     syncer::StringOrdinal());
+  AppListExtensionOrdering* ordering = GetExtensionOrdering(profile_);
+  if (!ordering->GetAppListOrdinal(extension_id_).IsValid())
+    ordering->InsertAtNextAvailable(extension_id_);
 }
 
 ExtensionAppItem::~ExtensionAppItem() {
 }
 
 bool ExtensionAppItem::HasOverlay() const {
 #if defined(OS_CHROMEOS)
   return false;
 #else
   return !is_platform_app_ && extension_id_ != extension_misc::kChromeAppId;
 #endif
 }
 
+bool ExtensionAppItem::Precedes(const ExtensionAppItem* item) const {
+  return GetExtensionOrdering(profile_)->ExtensionPrecedes(
+      extension_id(), item->extension_id());
+}
+
 void ExtensionAppItem::Reload() {
   const Extension* extension = GetExtension();
   bool is_installing = !extension;
   SetIsInstalling(is_installing);
   set_app_id(extension_id_);
   if (is_installing) {
     SetTitle(extension_name_);
     UpdateIcon();
     return;
   }
   SetTitle(extension->name());
   LoadImage(extension);
 }
 
-syncer::StringOrdinal ExtensionAppItem::GetPageOrdinal() const {
-  return GetExtensionSorting(profile_)->GetPageOrdinal(extension_id_);
-}
-
-syncer::StringOrdinal ExtensionAppItem::GetAppLaunchOrdinal() const {
-  return GetExtensionSorting(profile_)->GetAppLaunchOrdinal(extension_id_);
-}
-
 void ExtensionAppItem::Move(const ExtensionAppItem* prev,
                             const ExtensionAppItem* next) {
   // Does nothing if no predecessor nor successor.
   if (!prev && !next)
     return;
 
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   service->extension_prefs()->SetAppDraggedByUser(extension_id_);
+  AppListExtensionOrdering* ordering = GetExtensionOrdering(profile_);
 
   // Handles only predecessor or only successor case.

[koz (OOO until 15th September), 2013/06/18 07:41:36]

This handles more than just that case - it also handles them both being defined.

-  if (!prev || !next) {
-    syncer::StringOrdinal page = prev ? prev->GetPageOrdinal() :
-                                        next->GetPageOrdinal();
-    GetExtensionSorting(profile_)->SetPageOrdinal(extension_id_, page);
-    service->OnExtensionMoved(extension_id_,
-                              prev ? prev->extension_id() : std::string(),
-                              next ? next->extension_id() : std::string());
-    return;
-  }
-
-  // Handles both predecessor and successor are on the same page.
-  syncer::StringOrdinal prev_page = prev->GetPageOrdinal();
-  syncer::StringOrdinal next_page = next->GetPageOrdinal();
-  if (prev_page.Equals(next_page)) {
-    GetExtensionSorting(profile_)->SetPageOrdinal(extension_id_, prev_page);
-    service->OnExtensionMoved(extension_id_,
-                              prev->extension_id(),
-                              next->extension_id());
-    return;
-  }
-
-  // Otherwise, go with |next|. This is okay because app list does not split
-  // page based ntp page ordinal.
-  // TODO(xiyuan): Revisit this when implementing paging support.
-  GetExtensionSorting(profile_)->SetPageOrdinal(extension_id_, prev_page);
-  service->OnExtensionMoved(extension_id_,
-                            prev->extension_id(),
-                            std::string());
+  GetExtensionOrdering(profile_)->OnExtensionMoved(
+      extension_id_,
+      prev ? prev->extension_id() : std::string(),
+      next ? next->extension_id() : std::string());
 }
 
 void ExtensionAppItem::UpdateIcon() {
   if (!GetExtension()) {
     gfx::ImageSkia icon = installing_icon_;
     if (HasOverlay())
       icon = gfx::ImageSkia(new ShortcutOverlayImageSource(icon), icon.size());
     SetIcon(icon, !HasOverlay());
     return;
   }
@@ skipping 97 matching lines @@
     context_menu_.reset(new app_list::AppContextMenu(
         this, profile_, extension_id_, controller_, is_platform_app_));
   }
 
   return context_menu_->GetMenuModel();
 }
 
 void ExtensionAppItem::ExecuteLaunchCommand(int event_flags) {
   Launch(event_flags);
 }