Remove Ordinals Setters and Getters from ExtensionService

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 10 matching lines @@
 
 // A preference determining the page on which an app appears in the NTP.
 const char kPrefPageIndexDeprecated[] = "page_index";
 const char kPrefPageOrdinal[] = "page_ordinal";
 
 }  // namespace
 
 ExtensionSorting::ExtensionSorting(ExtensionScopedPrefs* extension_scoped_prefs,
                                    PrefService* pref_service)
     : extension_scoped_prefs_(extension_scoped_prefs),
-      pref_service_(pref_service) {
+      pref_service_(pref_service),
+      extension_service_(NULL) {
 }
 
 ExtensionSorting::~ExtensionSorting() {
 }
 
+void ExtensionSorting::SetExtensionService(
+    ExtensionService* extension_service) {
+  extension_service_ = extension_service;
+}
+
 void ExtensionSorting::Initialize(
     const ExtensionPrefs::ExtensionIdSet& extension_ids) {
   InitializePageOrdinalMap(extension_ids);
 
   MigrateAppIndex(extension_ids);
 }
 
 void ExtensionSorting::MigrateAppIndex(
     const ExtensionPrefs::ExtensionIdSet& extension_ids) {
   if (extension_ids.empty())
@@ skipping 223 matching lines @@
   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,
       new_value);
+
+  if (extension_service_) {
+    const Extension* ext =
+        extension_service_->GetInstalledExtension(extension_id);
+    DCHECK(!ext || ext->is_app());

[Aaron Boodman, 2012/03/14 18:54:28]

The extension system prefers CHECK to DCHECK.

[csharp, 2012/03/15 17:21:19]

Done.

+
+    if (ext)

[Aaron Boodman, 2012/03/14 18:54:28]

Move the DCHECK inside this branch and make it just DCHECK(ext->is_app()) ?

[csharp, 2012/03/15 17:21:19]

Done.

+      extension_service_->SyncExtensionChangeIfNeeded(*ext);
+  }
 }
 
 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 47 matching lines @@
     const {
   std::string raw_data;
   // If the preference read fails then raw_data will still be unset and we will
   // return an invalid StringOrdinal to signal that no page ordinal was found.
   extension_scoped_prefs_->ReadExtensionPrefString(
       extension_id, kPrefPageOrdinal, &raw_data);
   return StringOrdinal(raw_data);
 }
 
 void ExtensionSorting::SetPageOrdinal(const std::string& extension_id,
-                                    const StringOrdinal& new_page_ordinal) {
+                                      const StringOrdinal& new_page_ordinal) {
   // No work is required if the old and new values are the same.
   if (new_page_ordinal.EqualOrBothInvalid(GetPageOrdinal(extension_id)))
     return;
 
   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,
       new_value);
+
+  if (extension_service_) {
+    const Extension* ext =
+        extension_service_->GetInstalledExtension(extension_id);
+    DCHECK(!ext || ext->is_app());
+
+    if (ext)
+      extension_service_->SyncExtensionChangeIfNeeded(*ext);
+  }
 }
 
 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 108 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;
     }
   }
 }