Separate the NTP app ordering from the app list app ordering

chrome/browser/extensions/extension_prefs.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_scoped_prefs.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
+#include "chrome/browser/ui/app_list/app_list_extension_sorting.h"
 #include "chrome/common/extensions/extension.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "extensions/common/url_pattern_set.h"
 #include "sync/api/string_ordinal.h"
 
 class ExtensionPrefValueMap;
 class ExtensionSorting;
 class PrefService;
 class Profile;
 
@@ skipping 443 matching lines @@
   }
 
   // The underlying PrefService.
   PrefService* pref_service() const { return prefs_; }
 
   // The underlying ExtensionSorting.
   ExtensionSorting* extension_sorting() const {
     return extension_sorting_.get();
   }
 
+  // The ordering of apps in the app list.
+  AppListExtensionSorting* app_list_extension_sorting() const {
+    return app_list_extension_sorting_.get();
+  }
+
   // Describes the URLs that are able to install extensions. See
   // prefs::kExtensionAllowedInstallSites for more information.
   URLPatternSet GetAllowedInstallSites();
 
   // Schedules garbage collection of an extension's on-disk data on the next
   // start of this ExtensionService. Applies only to extensions with isolated
   // storage.
   void SetNeedsStorageGarbageCollection(bool value);
   bool NeedsStorageGarbageCollection();
 
@@ skipping 119 matching lines @@
   // Base extensions install directory.
   base::FilePath install_directory_;
 
   // Weak pointer, owned by Profile.
   ExtensionPrefValueMap* extension_pref_value_map_;
 
   // Contains all the logic for handling the order for various extension
   // properties.
   scoped_ptr<ExtensionSorting> extension_sorting_;
 
+  scoped_ptr<AppListExtensionSorting> app_list_extension_sorting_;
+
   scoped_refptr<ContentSettingsStore> content_settings_store_;
 
   scoped_ptr<TimeProvider> time_provider_;
 
   bool extensions_disabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPrefs);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_