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

Unified Diff: sync/internal_api/read_node.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
« no previous file with comments | « sync/internal_api/public/write_node.h ('k') | sync/internal_api/sync_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/read_node.cc
diff --git a/sync/internal_api/read_node.cc b/sync/internal_api/read_node.cc
index 6f7fc3578cefbfaad57fbe7a2dae68ab117896f2..9f3178170d0afba63a31fe218ca983ae9962bd8a 100644
--- a/sync/internal_api/read_node.cc
+++ b/sync/internal_api/read_node.cc
@@ -44,15 +44,15 @@ BaseNode::InitByLookupResult ReadNode::InitByIdLookup(int64 id) {
return INIT_FAILED_ENTRY_NOT_GOOD;
if (entry_->Get(syncable::IS_DEL))
return INIT_FAILED_ENTRY_IS_DEL;
- syncable::ModelType model_type = GetModelType();
- LOG_IF(WARNING, model_type == syncable::UNSPECIFIED ||
- model_type == syncable::TOP_LEVEL_FOLDER)
+ syncer::ModelType model_type = GetModelType();
+ LOG_IF(WARNING, model_type == syncer::UNSPECIFIED ||
+ model_type == syncer::TOP_LEVEL_FOLDER)
<< "SyncAPI InitByIdLookup referencing unusual object.";
return DecryptIfNecessary() ? INIT_OK : INIT_FAILED_DECRYPT_IF_NECESSARY;
}
BaseNode::InitByLookupResult ReadNode::InitByClientTagLookup(
- syncable::ModelType model_type,
+ syncer::ModelType model_type,
const std::string& tag) {
DCHECK(!entry_) << "Init called twice";
if (tag.empty())
@@ -88,9 +88,9 @@ BaseNode::InitByLookupResult ReadNode::InitByTagLookup(
return INIT_FAILED_ENTRY_NOT_GOOD;
if (entry_->Get(syncable::IS_DEL))
return INIT_FAILED_ENTRY_IS_DEL;
- syncable::ModelType model_type = GetModelType();
- LOG_IF(WARNING, model_type == syncable::UNSPECIFIED ||
- model_type == syncable::TOP_LEVEL_FOLDER)
+ syncer::ModelType model_type = GetModelType();
+ LOG_IF(WARNING, model_type == syncer::UNSPECIFIED ||
+ model_type == syncer::TOP_LEVEL_FOLDER)
<< "SyncAPI InitByTagLookup referencing unusually typed object.";
return DecryptIfNecessary() ? INIT_OK : INIT_FAILED_DECRYPT_IF_NECESSARY;
}
« no previous file with comments | « sync/internal_api/public/write_node.h ('k') | sync/internal_api/sync_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698