app_list: Use NTP ordering in ExtensionSorting to sort apps.

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/utf_string_conversions.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/extension_uninstall_dialog.h"
 #include "chrome/browser/extensions/management_policy.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 93 matching lines @@
   profile->GetExtensionService()->extension_prefs()->SetLaunchType(
       extension_id, launch_type);
 }
 
 bool IsExtensionEnabled(Profile* profile, const std::string& extension_id) {
   ExtensionService* service = profile->GetExtensionService();
   return service->IsExtensionEnabled(extension_id) &&
       !service->GetTerminatedExtension(extension_id);
 }
 
+ExtensionSorting* GetExtensionSorting(Profile* profile) {
+  return profile->GetExtensionService()->extension_prefs()->extension_sorting();
+}
+
 }  // namespace
 
 ExtensionAppItem::ExtensionAppItem(Profile* profile,
                                    const Extension* extension,
                                    AppListController* controller)
     : ChromeAppListItem(TYPE_APP),
       profile_(profile),
       extension_id_(extension->id()),
       controller_(controller) {
   SetTitle(extension->name());
   LoadImage(extension);
 }
 
 ExtensionAppItem::~ExtensionAppItem() {
 }
 
 const Extension* ExtensionAppItem::GetExtension() const {
   const Extension* extension =
     profile_->GetExtensionService()->GetInstalledExtension(extension_id_);
   return extension;
 }
 
+syncer::StringOrdinal ExtensionAppItem::GetPageOrdinal() const {
+  return GetExtensionSorting(profile_)->GetPageOrdinal(extension_id_);
+}
+
+syncer::StringOrdinal ExtensionAppItem::GetAppLaunchOrdinal() const {
+  return GetExtensionSorting(profile_)->GetAppLaunchOrdinal(extension_id_);
+}
+
 bool ExtensionAppItem::IsTalkExtension() const {
   // Test most likely version first.
   return extension_id_ == extension_misc::kTalkExtensionId ||
       extension_id_ == extension_misc::kTalkBetaExtensionId ||
       extension_id_ == extension_misc::kTalkAlphaExtensionId ||
       extension_id_ == extension_misc::kTalkDebugExtensionId;
 }
 
 void ExtensionAppItem::LoadImage(const Extension* extension) {
   icon_.reset(new extensions::IconImage(
@@ skipping 166 matching lines @@
     }
     context_menu_model_->AddSeparator(ui::NORMAL_SEPARATOR);
     context_menu_model_->AddItemWithStringId(OPTIONS, IDS_NEW_TAB_APP_OPTIONS);
     context_menu_model_->AddItemWithStringId(DETAILS, IDS_NEW_TAB_APP_DETAILS);
     context_menu_model_->AddItemWithStringId(UNINSTALL,
                                              IDS_EXTENSIONS_UNINSTALL);
   }
 
   return context_menu_model_.get();
 }