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

Unified Diff: chrome/browser/sync/glue/session_change_processor.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 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/sync/glue/session_change_processor.cc
diff --git a/chrome/browser/sync/glue/session_change_processor.cc b/chrome/browser/sync/glue/session_change_processor.cc
index b5d73928533c5dff248fd272bc590516234998da..c055b0726cf83b751a73fc80146a5aa86a5ecd8d 100644
--- a/chrome/browser/sync/glue/session_change_processor.cc
+++ b/chrome/browser/sync/glue/session_change_processor.cc
@@ -213,13 +213,13 @@ void SessionChangeProcessor::Observe(
entry->GetVirtualURL().is_valid() &&
entry->GetVirtualURL().spec() == kNTPOpenTabSyncURL) {
DVLOG(1) << "Triggering sync refresh for sessions datatype.";
- const syncable::ModelType type = syncable::SESSIONS;
- syncable::ModelTypePayloadMap payload_map;
+ const syncer::ModelType type = syncer::SESSIONS;
+ syncer::ModelTypePayloadMap payload_map;
payload_map[type] = "";
content::NotificationService::current()->Notify(
chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
content::Source<Profile>(profile_),
- content::Details<const syncable::ModelTypePayloadMap>(&payload_map));
+ content::Details<const syncer::ModelTypePayloadMap>(&payload_map));
}
}
@@ -277,8 +277,8 @@ void SessionChangeProcessor::ApplyChangesFromSyncModel(
// Deletions are all or nothing (since we only ever delete entire
// sessions). Therefore we don't care if it's a tab node or meta node,
// and just ensure we've disassociated.
- DCHECK_EQ(syncable::GetModelTypeFromSpecifics(it->specifics),
- syncable::SESSIONS);
+ DCHECK_EQ(syncer::GetModelTypeFromSpecifics(it->specifics),
+ syncer::SESSIONS);
const sync_pb::SessionSpecifics& specifics = it->specifics.session();
if (specifics.session_tag() == local_tag) {
// Another client has attempted to delete our local data (possibly by
@@ -303,7 +303,7 @@ void SessionChangeProcessor::ApplyChangesFromSyncModel(
// Check that the changed node is a child of the session folder.
DCHECK(root.GetId() == sync_node.GetParentId());
- DCHECK(syncable::SESSIONS == sync_node.GetModelType());
+ DCHECK(syncer::SESSIONS == sync_node.GetModelType());
const sync_pb::SessionSpecifics& specifics(
sync_node.GetSessionSpecifics());

Powered by Google App Engine
This is Rietveld 408576698