Make the Chrome Web Store Icon Syncable

chrome/browser/extensions/extension_sorting.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_sorting.h"
 
 #include "chrome/browser/extensions/extension_scoped_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 172 matching lines @@
       }
     }
   }
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED,
       content::Source<ExtensionSorting>(this),
       content::NotificationService::NoDetails());
 }
 
+void ExtensionSorting::EnsureValidOrdinals(const std::string& extension_id) {
+  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();
+    SetPageOrdinal(extension_id, page_ordinal);
+  }
+
+  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);
+  }
+}
+
 void ExtensionSorting::OnExtensionMoved(
     const std::string& moved_extension_id,
     const std::string& predecessor_extension_id,
     const std::string& successor_extension_id) {
   // We only need to change the StringOrdinal if there are neighbours.
   if (!predecessor_extension_id.empty() || !successor_extension_id.empty()) {
     if (predecessor_extension_id.empty()) {
       // Only a successor.
       SetAppLaunchOrdinal(
           moved_extension_id,
@@ skipping 33 matching lines @@
 }
 
 void ExtensionSorting::SetAppLaunchOrdinal(
     const std::string& extension_id,
     const StringOrdinal& new_app_launch_ordinal) {
   StringOrdinal page_ordinal = GetPageOrdinal(extension_id);
   RemoveOrdinalMapping(
       extension_id, page_ordinal, GetAppLaunchOrdinal(extension_id));
   AddOrdinalMapping(extension_id, page_ordinal, new_app_launch_ordinal);
 
+  Value* new_value = new_app_launch_ordinal.IsValid() ?
+      Value::CreateStringValue(new_app_launch_ordinal.ToString()) :
+      NULL;
+
   extension_scoped_prefs_->UpdateExtensionPref(
       extension_id,
       kPrefAppLaunchOrdinal,
-      Value::CreateStringValue(new_app_launch_ordinal.ToString()));
+      new_value);
 }
 
 StringOrdinal ExtensionSorting::CreateFirstAppLaunchOrdinal(
     const StringOrdinal& page_ordinal) const {
   const StringOrdinal& min_ordinal =
       GetMinOrMaxAppLaunchOrdinalsOnPage(page_ordinal,
                                          ExtensionSorting::MIN_ORDINAL);
 
   if (min_ordinal.IsValid())
     return min_ordinal.CreateBefore();
@@ skipping 53 matching lines @@
   return StringOrdinal(raw_data);
 }
 
 void ExtensionSorting::SetPageOrdinal(const std::string& extension_id,
                                     const StringOrdinal& new_page_ordinal) {
   StringOrdinal app_launch_ordinal = GetAppLaunchOrdinal(extension_id);
   RemoveOrdinalMapping(
       extension_id, GetPageOrdinal(extension_id), app_launch_ordinal);
   AddOrdinalMapping(extension_id, new_page_ordinal, app_launch_ordinal);
 
+  Value* new_value = new_page_ordinal.IsValid() ?
+      Value::CreateStringValue(new_page_ordinal.ToString()) :
+      NULL;
+
   extension_scoped_prefs_->UpdateExtensionPref(
       extension_id,
       kPrefPageOrdinal,
-      Value::CreateStringValue(new_page_ordinal.ToString()));
+      new_value);
 }
 
 void ExtensionSorting::ClearOrdinals(const std::string& extension_id) {
   RemoveOrdinalMapping(extension_id,
                        GetPageOrdinal(extension_id),
                        GetAppLaunchOrdinal(extension_id));
 
   extension_scoped_prefs_->UpdateExtensionPref(
       extension_id, kPrefPageOrdinal, NULL);
   extension_scoped_prefs_->UpdateExtensionPref(
@@ skipping 111 matching lines @@
 
   for (AppLaunchOrdinalMap::iterator it =
            page_map->second.find(app_launch_ordinal);
        it != page_map->second.end(); ++it) {
     if (it->second == extension_id) {
       page_map->second.erase(it);
       break;
     }
   }
 }