Remove Ordinals Setters and Getters from ExtensionService

Move the page and app launch setters and getters out of ExtensionService, moving their functionality into ExtensionSorting with the rest of the ordinal logic.


BUG=109769
TEST=ExtensionService unit tests pass and TwoClientAppsSync sync_integreation tests pass.


Review URL: http://codereview.chromium.org/9706017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127953 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 0 deletions

diff --git a/chrome/browser/extensions/extension_sorting.h b/chrome/browser/extensions/extension_sorting.h
index 3542d51..b0bf38a 100644
--- a/chrome/browser/extensions/extension_sorting.h
+++ b/chrome/browser/extensions/extension_sorting.h
@@ -14,6 +14,7 @@
 #include "chrome/common/string_ordinal.h"
 
 class ExtensionScopedPrefs;
+class ExtensionServiceInterface;
 
 class ExtensionSorting {
  public:
@@ -21,6 +22,9 @@ class ExtensionSorting {
                             PrefService* pref_service);
   ~ExtensionSorting();
 
+  // Set up the ExtensionService to inform of changes that require syncing.
+  void SetExtensionService(ExtensionServiceInterface* extension_service);
+
   // Properly initialize ExtensionSorting internal values that require
   // |extension_ids|.
   void Initialize(const ExtensionPrefs::ExtensionIdSet& extension_ids);
@@ -133,8 +137,13 @@ class ExtensionSorting {
                             const StringOrdinal& page_ordinal,
                             const StringOrdinal& app_launch_ordinal);
 
+  // Syncs the extension if needed. It is an error to call this if the
+  // extension is not an application.
+  void SyncIfNeeded(const std::string& extension_id);
+
   ExtensionScopedPrefs* extension_scoped_prefs_;  // Weak, owns this instance.
   PrefService* pref_service_;  // Weak.
+  ExtensionServiceInterface* extension_service_;  // Weak.
 
   // A map of all the StringOrdinal page ordinals mapping to the collections of
   // app launch ordinals that exist on that page. This is used for mapping