cros: Implement default app ordering.

chrome/browser/extensions/extension_prefs.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/extensions/extension_prefs.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 645 matching lines @@
   UpdateExtensionPref(extension_id, kPrefAppNotificationClientId,
                       Value::CreateStringValue(oauth_client_id));
 }
 
 bool ExtensionPrefs::IsAppNotificationDisabled(
     const std::string& extension_id) const {
   return ReadExtensionPrefBoolean(extension_id, kPrefAppNotificationDisbaled);
 }
 
 void ExtensionPrefs::SetAppNotificationDisabled(
-   const std::string& extension_id, bool value) {
+    const std::string& extension_id, bool value) {
   DCHECK(Extension::IdIsValid(extension_id));
   UpdateExtensionPref(extension_id, kPrefAppNotificationDisbaled,
                       Value::CreateBooleanValue(value));
 }
 
 std::string ExtensionPrefs::GetDebugPolicyProviderName() const {
 #ifdef NDEBUG
   NOTREACHED();
   return std::string();
 #else
@@ skipping 796 matching lines @@
   // We store prefs about LOAD extensions, but don't cache their manifest
   // since it may change on disk.
   if (extension->location() != Extension::LOAD) {
     extension_dict->Set(kPrefManifest,
                         extension->manifest()->value()->DeepCopy());
   }
 
   // Clear state that may be registered from a previous install.
   extension_dict->Remove(kRegisteredEvents, NULL);
 
-  if (extension->is_app()) {
-    syncer::StringOrdinal new_page_ordinal = page_ordinal.IsValid() ?
-        page_ordinal : extension_sorting_->GetNaturalAppPageOrdinal();
-    if (!extension_sorting_->GetPageOrdinal(id).IsValid())
-      extension_sorting_->SetPageOrdinal(id, new_page_ordinal);
-    if (!extension_sorting_->GetAppLaunchOrdinal(id).IsValid())
-      extension_sorting_->SetAppLaunchOrdinal(
-          id, extension_sorting_->CreateNextAppLaunchOrdinal(new_page_ordinal));
-  }
+  if (extension->ShouldDisplayInLauncher())
+    extension_sorting_->EnsureValidOrdinals(extension->id(), page_ordinal);
 
   extension_pref_value_map_->RegisterExtension(
       id, install_time, initial_state == Extension::ENABLED);
   content_settings_store_->RegisterExtension(
       id, install_time, initial_state == Extension::ENABLED);
 }
 
 void ExtensionPrefs::OnExtensionUninstalled(const std::string& extension_id,
                                             const Extension::Location& location,
                                             bool external_uninstall) {
@@ skipping 704 matching lines @@
                                                 const ExtensionIds& strings) {
   ListPrefUpdate update(prefs_, pref);
   ListValue* list_of_values = update.Get();
   list_of_values->Clear();
   for (ExtensionIds::const_iterator iter = strings.begin();
        iter != strings.end(); ++iter)
     list_of_values->Append(new StringValue(*iter));
 }
 
 }  // namespace extensions