Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1560)

Unified Diff: chrome/browser/extensions/extension_prefs.cc

Issue 10920017: [Sync] Generalize StringOrdinal to handle ordinal_in_parent field (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Relax tests Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_prefs.h ('k') | chrome/browser/extensions/extension_prefs_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 1a84624d1d25c9178c1504c4cb787c63b21f0cec..3b536c0064e02ec4ec87ea3d52e3432c1f82d19b 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -1401,7 +1401,7 @@ void ExtensionPrefs::OnExtensionInstalled(
const Extension* extension,
Extension::State initial_state,
bool from_webstore,
- const StringOrdinal& page_ordinal) {
+ const syncer::StringOrdinal& page_ordinal) {
const std::string& id = extension->id();
CHECK(Extension::IdIsValid(id));
ScopedExtensionPrefUpdate update(prefs_, id);
@@ -1439,7 +1439,7 @@ void ExtensionPrefs::OnExtensionInstalled(
extension_dict->Remove(kRegisteredEvents, NULL);
if (extension->is_app()) {
- StringOrdinal new_page_ordinal = page_ordinal.IsValid() ?
+ syncer::StringOrdinal new_page_ordinal = page_ordinal.IsValid() ?
page_ordinal : extension_sorting_->GetNaturalAppPageOrdinal();
if (!extension_sorting_->GetPageOrdinal(id).IsValid())
extension_sorting_->SetPageOrdinal(id, new_page_ordinal);
« no previous file with comments | « chrome/browser/extensions/extension_prefs.h ('k') | chrome/browser/extensions/extension_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698