Moving Ordinal Specific Code out of ExtensionPrefs
Moved all of the ordinal specific code in ExtensionPrefs to a new class
ExtensionSorting, also moved the related unit tests to an ExtensionSorting
unit test file.
There are no logic changes in this patch.
BUG=104973
TEST=The icons on the NTP should behave the same as before, with users able to
move them around and remember position.
Review URL: http://codereview.chromium.org/9021034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117490 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index cadf4ff..f8dd4cc 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -48,6 +48,7 @@
#include "chrome/browser/extensions/extension_preference_api.h"
#include "chrome/browser/extensions/extension_process_manager.h"
#include "chrome/browser/extensions/extension_processes_api.h"
+#include "chrome/browser/extensions/extension_sorting.h"
#include "chrome/browser/extensions/extension_special_storage_policy.h"
#include "chrome/browser/extensions/extension_sync_data.h"
#include "chrome/browser/extensions/extension_updater.h"
@@ -1609,7 +1610,8 @@
StringOrdinal ExtensionService::GetAppLaunchOrdinal(
const std::string& extension_id) const {
- return extension_prefs_->GetAppLaunchOrdinal(extension_id);
+ return
+ extension_prefs_->extension_sorting()->GetAppLaunchOrdinal(extension_id);
}
void ExtensionService::SetAppLaunchOrdinal(
@@ -1618,7 +1620,8 @@
const Extension* ext = GetExtensionById(extension_id, true);
DCHECK(ext->is_app());
- extension_prefs_->SetAppLaunchOrdinal(extension_id, app_launch_index);
+ extension_prefs_->extension_sorting()->SetAppLaunchOrdinal(
+ extension_id, app_launch_index);
const Extension* extension = GetInstalledExtension(extension_id);
if (extension)
@@ -1627,7 +1630,7 @@
StringOrdinal ExtensionService::GetPageOrdinal(
const std::string& extension_id) const {
- return extension_prefs_->GetPageOrdinal(extension_id);
+ return extension_prefs_->extension_sorting()->GetPageOrdinal(extension_id);
}
void ExtensionService::SetPageOrdinal(const std::string& extension_id,
@@ -1635,7 +1638,8 @@
const Extension* ext = GetExtensionById(extension_id, true);
DCHECK(ext->is_app());
- extension_prefs_->SetPageOrdinal(extension_id, page_ordinal);
+ extension_prefs_->extension_sorting()->SetPageOrdinal(
+ extension_id, page_ordinal);
const Extension* extension = GetInstalledExtension(extension_id);
if (extension)
@@ -1646,9 +1650,10 @@
const std::string& moved_extension_id,
const std::string& predecessor_extension_id,
const std::string& successor_extension_id) {
- extension_prefs_->OnExtensionMoved(moved_extension_id,
- predecessor_extension_id,
- successor_extension_id);
+ extension_prefs_->extension_sorting()->OnExtensionMoved(
+ moved_extension_id,
+ predecessor_extension_id,
+ successor_extension_id);
const Extension* extension = GetInstalledExtension(moved_extension_id);
if (extension)
