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

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

Issue 10920017: [Sync] Generalize StringOrdinal to handle ordinal_in_parent field (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix another compile error Created 8 years, 4 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
Index: chrome/browser/extensions/app_sync_data.cc
diff --git a/chrome/browser/extensions/app_sync_data.cc b/chrome/browser/extensions/app_sync_data.cc
index d4d24b5bcfdceea189127455b018c4c6f8b081df..60739514f541f7c282852b8d7348a095bc62f11f 100644
--- a/chrome/browser/extensions/app_sync_data.cc
+++ b/chrome/browser/extensions/app_sync_data.cc
@@ -30,8 +30,8 @@ AppSyncData::AppSyncData(const Extension& extension,
bool incognito_enabled,
const std::string& notifications_client_id,
bool notifications_disabled,
- const StringOrdinal& app_launch_ordinal,
- const StringOrdinal& page_ordinal)
+ const syncer::StringOrdinal& app_launch_ordinal,
+ const syncer::StringOrdinal& page_ordinal)
: extension_sync_data_(extension, enabled, incognito_enabled),
notifications_client_id_(notifications_client_id),
notifications_disabled_(notifications_disabled),
@@ -88,8 +88,8 @@ void AppSyncData::PopulateFromAppSpecifics(
specifics.notification_settings().has_disabled() &&
specifics.notification_settings().disabled();
- app_launch_ordinal_ = StringOrdinal(specifics.app_launch_ordinal());
- page_ordinal_ = StringOrdinal(specifics.page_ordinal());
+ app_launch_ordinal_ = syncer::StringOrdinal(specifics.app_launch_ordinal());
+ page_ordinal_ = syncer::StringOrdinal(specifics.page_ordinal());
}
void AppSyncData::PopulateFromSyncData(const syncer::SyncData& sync_data) {

Powered by Google App Engine
This is Rietveld 408576698