cros: Implement default app ordering.

chrome/browser/extensions/extension_sorting.cc

Index: chrome/browser/extensions/extension_sorting.cc
diff --git a/chrome/browser/extensions/extension_sorting.cc b/chrome/browser/extensions/extension_sorting.cc
index 9a0dc69d1077114c4bd6c369b5ee3aae892a6fce..20df1780e6c586580287b76ac13f084171c0e3a8 100644
--- a/chrome/browser/extensions/extension_sorting.cc
+++ b/chrome/browser/extensions/extension_sorting.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/extensions/extension_sorting.h"
 
+#include <algorithm>
+#include <vector>
+
 #include "chrome/browser/extensions/extension_scoped_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -33,6 +36,7 @@ ExtensionSorting::ExtensionSorting(ExtensionScopedPrefs* extension_scoped_prefs,
     : extension_scoped_prefs_(extension_scoped_prefs),
       pref_service_(pref_service),
       extension_service_(NULL) {
+  CreateDefaultOrdinals();
 }
 
 ExtensionSorting::~ExtensionSorting() {
@@ -202,24 +206,31 @@ void ExtensionSorting::FixNTPOrdinalCollisions() {
       content::NotificationService::NoDetails());
 }
 
-void ExtensionSorting::EnsureValidOrdinals(const std::string& extension_id) {
+void ExtensionSorting::EnsureValidOrdinals(
+    const std::string& extension_id,
+    const syncer::StringOrdinal& suggested_page) {
   syncer::StringOrdinal page_ordinal = GetPageOrdinal(extension_id);
   if (!page_ordinal.IsValid()) {
-    // The webstore app should always start be on the first page.
-    page_ordinal = extension_id == extension_misc::kWebStoreAppId ?
-        CreateFirstAppPageOrdinal() :
-        GetNaturalAppPageOrdinal();
+    if (suggested_page.IsValid()) {
+      page_ordinal = suggested_page;
+    } else if (!GetDefaultOrdinals(extension_id, &page_ordinal, NULL) ||
+        !page_ordinal.IsValid()) {
+      page_ordinal = GetNaturalAppPageOrdinal();
+    }
+
     SetPageOrdinal(extension_id, page_ordinal);
   }
 
   syncer::StringOrdinal app_launch_ordinal = GetAppLaunchOrdinal(extension_id);
   if (!app_launch_ordinal.IsValid()) {
-    // The webstore app should always start in the position.
-    app_launch_ordinal = extension_id == extension_misc::kWebStoreAppId ?
-        CreateFirstAppLaunchOrdinal(page_ordinal) :
-        CreateNextAppLaunchOrdinal(page_ordinal);
-    SetAppLaunchOrdinal(extension_id,
-                        app_launch_ordinal);
+    // If using default app launcher ordinal, make sure there is no collision.
+    if (GetDefaultOrdinals(extension_id, NULL, &app_launch_ordinal) &&
+        app_launch_ordinal.IsValid())
+      app_launch_ordinal = ResolveCollision(page_ordinal, app_launch_ordinal);
+    else
+      app_launch_ordinal = CreateNextAppLaunchOrdinal(page_ordinal);
+
+    SetAppLaunchOrdinal(extension_id, app_launch_ordinal);
   }
 }
 
@@ -515,3 +526,84 @@ void ExtensionSorting::SyncIfNeeded(const std::string& extension_id) {
     }
   }
 }
+
+void ExtensionSorting::CreateDefaultOrdinals() {
+  // The following defines the default order of apps.
+#if defined(OS_CHROMEOS)
+  const char* kDefaultAppOrder[] = {
+    extension_misc::kChromeAppId,
+    extension_misc::kWebStoreAppId,
+    "coobgpohoikkiipiblmjeljniedjpjpf",  // Search
+    "blpcfgokakmgnkcojhhkbfbldkacnbeo",  // Youtube
+    "pjkljhegncpnkpknbcohdijeoejaedia",  // Gmail
+    "ejjicmeblgpmajnghnpcppodonldlgfn",  // Calendar
+    "kjebfhglflhjjjiceimfkgicifkhjlnm",  // Scratchpad
+    "lneaknkopdijkpnocmklfnjbeapigfbh",  // Google Maps
+    "apdfllckaahabafndbhieahigkjlhalf",  // Drive
+    "aohghmighlieiainnegkcijnfilokake",  // Docs
+    "felcaaldnbdncclmgdcncolpebgiejap",  // Sheets
+    "aapocclcgogkmnckokdopfmhonfmgoek",  // Slides
+    "dlppkpafhbajpcmmoheippocdidnckmm",  // Google+
+    "kbpgddbgniojgndnhlkjbkpknjhppkbk",  // Google+ Hangouts
+    "hhaomjibdihmijegdhdafkllkbggdgoj",  // Files
+    "hkhhlkdconhgemhegnplaldnmnmkaemd",  // Tips & Tricks
+    "icppfcnhkcmnfdhfhphakoifcfokfdhg",  // Play Music
+    "mmimngoggfoobjdlefbcabngfnmieonb",  // Play Books
+    "fppdphmgcddhjeddoeghpjefkdlccljb",  // Play Movies
+    "fobcpibfeplaikcclojfdhfdmbbeofai",  // Games
+    "joodangkbfjnajiiifokapkpmhfnpleo",  // Calculator
+    "cmbmjjimlbmpkonhnfabflhampihgnea",  // Camera
+    "gbchcmhmhahfdphkhkmpfmihenigjmpp",  // Chrome Remote Desktop
+  };
+#else
+  const char* kDefaultAppOrder[] = {
+    extension_misc::kWebStoreAppId,
+  };
+#endif
+
+  syncer::StringOrdinal page_ordinal = CreateFirstAppPageOrdinal();
+  syncer::StringOrdinal app_launch_ordinal =
+      CreateFirstAppLaunchOrdinal(page_ordinal);
+  for (size_t i = 0; i < arraysize(kDefaultAppOrder); ++i) {
+    const std::string extension_id = kDefaultAppOrder[i];
+    default_ordinals_[extension_id].page_ordinal = page_ordinal;
+    default_ordinals_[extension_id].app_launch_ordinal = app_launch_ordinal;
+    app_launch_ordinal = app_launch_ordinal.CreateAfter();
+  }
+}
+
+bool ExtensionSorting::GetDefaultOrdinals(
+    const std::string& extension_id,
+    syncer::StringOrdinal* page_ordinal,
+    syncer::StringOrdinal* app_launch_ordinal) const {
+  AppOrdinalsMap::const_iterator it = default_ordinals_.find(extension_id);
+  if (it == default_ordinals_.end())
+    return false;
+
+  if (page_ordinal)
+    *page_ordinal = it->second.page_ordinal;
+  if (app_launch_ordinal)
+    *app_launch_ordinal = it->second.app_launch_ordinal;
+  return true;
+}
+
+syncer::StringOrdinal ExtensionSorting::ResolveCollision(
+    const syncer::StringOrdinal& page_ordinal,
+    const syncer::StringOrdinal& app_launch_ordinal) const {
+  DCHECK(page_ordinal.IsValid() && app_launch_ordinal.IsValid());
+
+  PageOrdinalMap::const_iterator page_it = ntp_ordinal_map_.find(page_ordinal);
+  if (page_it == ntp_ordinal_map_.end())
+    return app_launch_ordinal;
+
+  const AppLaunchOrdinalMap& page = page_it->second;
+  if (page.find(app_launch_ordinal) == page.end())
+    return app_launch_ordinal;
+
+  syncer::StringOrdinal next_ordinal = app_launch_ordinal.CreateAfter();

[csharp, 2012/09/24 14:09:45]

I think this section should be replaced by:
return app_launch_ordinal.CreateBetween(page.find(app_launch_ordinal) + 1)

This way the app launch ordinal appears right after the one it conflicted with
(which I assume is the intended behavior)  

[xiyuan, 2012/09/24 16:37:12]

Done. Good call. This is much better than using a loop.

+  while (page.find(next_ordinal) != page.end())
+    next_ordinal = app_launch_ordinal.CreateBetween(next_ordinal);
+
+  return next_ordinal;
+}
+