Separate the NTP app ordering from the app list app ordering

chrome/browser/extensions/install_tracker.cc

 // Copyright 2013 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/install_tracker.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 
 namespace extensions {
 
 InstallTracker::InstallTracker(Profile* profile,
-                               extensions::ExtensionPrefs* prefs) {
-  ExtensionSorting* sorting = prefs->extension_sorting();
+                               extensions::ExtensionPrefs* prefs)
+    : app_list_extension_sorting_(prefs->app_list_extension_sorting()) {
+  app_list_extension_sorting_->AddObserver(this);
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
       content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       content::Source<Profile>(profile));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED,
-      content::Source<ExtensionSorting>(sorting));
   registrar_.Add(this, chrome::NOTIFICATION_APP_INSTALLED_TO_APPLIST,
       content::Source<Profile>(profile));
 
   pref_change_registrar_.Init(prefs->pref_service());
   pref_change_registrar_.Add(extensions::ExtensionPrefs::kExtensionsPref,
-                             base::Bind(&InstallTracker::OnAppsReordered,
+                             base::Bind(&InstallTracker::ExtensionPrefsChanged,
                                         base::Unretained(this)));
 }
 
 InstallTracker::~InstallTracker() {
+  app_list_extension_sorting_->RemoveObserver(this);
 }
 
 void InstallTracker::AddObserver(InstallObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void InstallTracker::RemoveObserver(InstallObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 58 matching lines @@
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: {
       const Extension* extension =
           content::Details<const Extension>(details).ptr();
 
       FOR_EACH_OBSERVER(InstallObserver, observers_,
                         OnExtensionUninstalled(extension));
       break;
     }
-    case chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED: {
-      FOR_EACH_OBSERVER(InstallObserver, observers_, OnAppsReordered());
-      break;
-    }
     case chrome::NOTIFICATION_APP_INSTALLED_TO_APPLIST: {
       const std::string& extension_id(
           *content::Details<const std::string>(details).ptr());
       FOR_EACH_OBSERVER(InstallObserver, observers_,
                         OnAppInstalledToAppList(extension_id));
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
-void InstallTracker::OnAppsReordered() {
-  FOR_EACH_OBSERVER(InstallObserver, observers_, OnAppsReordered());
+void InstallTracker::OnAppListReordered() {
+  FOR_EACH_OBSERVER(InstallObserver, observers_, OnAppListReordered());
+}
+
+void InstallTracker::ExtensionPrefsChanged() {
+  FOR_EACH_OBSERVER(InstallObserver, observers_, OnAppListReordered());
 }
 
 }  // namespace extensions