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

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

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head 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/bookmark_change_processor.cc
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index e459e52e9aa11ea5b5a63304a507a82887b0e44b..fcce75e11938d6b9b20220b8fbc4deb33e28c8b9 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -224,7 +224,7 @@ void BookmarkChangeProcessor::BookmarkNodeChanged(BookmarkModel* model,
error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
"Could not InitByIdLookup on BookmarkNodeChanged, good() failed");
LOG(ERROR) << "Bad entry.";
- } else if (sync_node.GetEntry()->Get(syncable::IS_DEL)) {
+ } else if (sync_node.GetEntry()->Get(syncer::syncable::IS_DEL)) {
error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
"Could not InitByIdLookup on BookmarkNodeChanged, is_del true");
LOG(ERROR) << "Deleted entry.";
@@ -232,7 +232,7 @@ void BookmarkChangeProcessor::BookmarkNodeChanged(BookmarkModel* model,
syncer::Cryptographer* crypto = trans.GetCryptographer();
syncable::ModelTypeSet encrypted_types(crypto->GetEncryptedTypes());
const sync_pb::EntitySpecifics& specifics =
- sync_node.GetEntry()->Get(syncable::SPECIFICS);
+ sync_node.GetEntry()->Get(syncer::syncable::SPECIFICS);
CHECK(specifics.has_encrypted());
const bool can_decrypt = crypto->CanDecrypt(specifics.encrypted());
const bool agreement = encrypted_types.Has(syncable::BOOKMARKS);
« no previous file with comments | « chrome/browser/sync/abstract_profile_sync_service_test.cc ('k') | chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698