Separate the NTP app ordering from the app list app ordering

chrome/browser/ui/app_list/apps_model_builder.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/apps_model_builder.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/prefs/pref_service.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/extensions/install_tracker.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/gfx/image/image_skia.h"
 
 using extensions::Extension;
 
 namespace {
 
 bool AppPrecedes(const ExtensionAppItem* app1, const ExtensionAppItem* app2) {
-  const syncer::StringOrdinal& page1 = app1->GetPageOrdinal();
-  const syncer::StringOrdinal& page2 = app2->GetPageOrdinal();
-  if (page1.LessThan(page2))
-    return true;
-
-  if (page1.Equals(page2))
-    return app1->GetAppLaunchOrdinal().LessThan(app2->GetAppLaunchOrdinal());
-
-  return false;
+  return app1->Precedes(app2);
 }
 
 bool ShouldDisplayInAppLauncher(Profile* profile,
                                 scoped_refptr<const Extension> app) {
   // If it's the web store, check the policy.
   bool blocked_by_policy =
       (app->id() == extension_misc::kWebStoreAppId ||
        app->id() == extension_misc::kEnterpriseWebStoreAppId) &&
       profile->GetPrefs()->GetBoolean(prefs::kHideWebStoreIcon);
   return app->ShouldDisplayInAppLauncher() && !blocked_by_policy;
@@ skipping 86 matching lines @@
   model_->DeleteAt(index);
 }
 
 void AppsModelBuilder::OnExtensionDisabled(const Extension* extension) {
   int index = FindApp(extension->id());
   if (index < 0)
     return;
   GetAppAt(index)->UpdateIcon();
 }
 
-void AppsModelBuilder::OnAppsReordered() {
+void AppsModelBuilder::OnAppListReordered() {
   ResortApps();
 }
 
 void AppsModelBuilder::OnAppInstalledToAppList(
     const std::string& extension_id) {
   SetHighlightedApp(extension_id);
 }
 
 void AppsModelBuilder::OnShutdown() {
   if (tracker_) {
@@ skipping 22 matching lines @@
     return;
 
   Apps apps;
   AddApps(service->extensions(), &apps);
   AddApps(service->disabled_extensions(), &apps);
   AddApps(service->terminated_extensions(), &apps);
 
   if (apps.empty())
     return;
 
-  service->extension_prefs()->extension_sorting()->FixNTPOrdinalCollisions();
+  service->extension_prefs()->app_list_extension_ordering()->
+      FixSyncCollisions();
   std::sort(apps.begin(), apps.end(), &AppPrecedes);
 
   for (size_t i = 0; i < apps.size(); ++i)
     model_->Add(apps[i]);
 }
 
 void AppsModelBuilder::ResortApps() {
   Apps apps;
   for (size_t i = 0; i < model_->item_count(); ++i)
     apps.push_back(GetAppAt(i));
@@ skipping 105 matching lines @@
 
   ExtensionAppItem* prev = target_index > 0 ? GetAppAt(target_index - 1) : NULL;
   ExtensionAppItem* next = target_index + 1 < model_->item_count() ?
       GetAppAt(target_index + 1) : NULL;
   GetAppAt(target_index)->Move(prev, next);
 }
 
 void AppsModelBuilder::ListItemsChanged(size_t start, size_t count) {
   NOTREACHED();
 }