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: components/sync/core/delete_journal.cc

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 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 | « components/sync/core/delete_journal.h ('k') | components/sync/core/http_bridge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/core/delete_journal.cc
diff --git a/components/sync/core/delete_journal.cc b/components/sync/core/delete_journal.cc
index 43c18755a32573a058dc3a3f2bff59413edc1497..5dd65abdb1e73319bc9da9e926be36255765d7be 100644
--- a/components/sync/core/delete_journal.cc
+++ b/components/sync/core/delete_journal.cc
@@ -16,19 +16,21 @@ namespace syncer {
void DeleteJournal::GetBookmarkDeleteJournals(
BaseTransaction* trans,
BookmarkDeleteJournalList* delete_journal_list) {
- syncable::EntryKernelSet deleted_entries;
+ syncer::syncable::EntryKernelSet deleted_entries;
trans->GetDirectory()->delete_journal()->GetDeleteJournals(
trans->GetWrappedTrans(), BOOKMARKS, &deleted_entries);
std::set<int64_t> undecryptable_journal;
- for (syncable::EntryKernelSet::const_iterator i = deleted_entries.begin();
+ for (syncer::syncable::EntryKernelSet::const_iterator i =
+ deleted_entries.begin();
i != deleted_entries.end(); ++i) {
delete_journal_list->push_back(BookmarkDeleteJournal());
- delete_journal_list->back().id = (*i)->ref(syncable::META_HANDLE);
+ delete_journal_list->back().id = (*i)->ref(syncer::syncable::META_HANDLE);
delete_journal_list->back().external_id =
- (*i)->ref(syncable::LOCAL_EXTERNAL_ID);
- delete_journal_list->back().is_folder = (*i)->ref(syncable::IS_DIR);
+ (*i)->ref(syncer::syncable::LOCAL_EXTERNAL_ID);
+ delete_journal_list->back().is_folder = (*i)->ref(syncer::syncable::IS_DIR);
- const sync_pb::EntitySpecifics& specifics = (*i)->ref(syncable::SPECIFICS);
+ const sync_pb::EntitySpecifics& specifics =
+ (*i)->ref(syncer::syncable::SPECIFICS);
if (!specifics.has_encrypted()) {
delete_journal_list->back().specifics = specifics;
} else {
« no previous file with comments | « components/sync/core/delete_journal.h ('k') | components/sync/core/http_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698