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

Unified Diff: chrome/browser/sync/engine/process_updates_command.cc

Issue 553015: Support for multiple sync ModelSafeWorkers.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 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 | « chrome/browser/sync/engine/model_safe_worker.h ('k') | chrome/browser/sync/engine/syncapi.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/process_updates_command.cc
===================================================================
--- chrome/browser/sync/engine/process_updates_command.cc (revision 36603)
+++ chrome/browser/sync/engine/process_updates_command.cc (working copy)
@@ -122,7 +122,7 @@
const bool deleted = entry.has_deleted() && entry.deleted();
const bool is_directory = entry.IsFolder();
const bool is_bookmark =
- SyncerUtil::GetSyncDataType(entry) == SYNC_TYPE_BOOKMARK;
+ SyncerUtil::GetModelType(entry) == syncable::BOOKMARKS;
return VERIFY_SUCCESS == SyncerUtil::VerifyUpdateConsistency(trans,
entry,
@@ -141,8 +141,7 @@
const SyncEntity& entry = *static_cast<const SyncEntity*>(&pb_entry);
using namespace syncable;
syncable::Id id = entry.id();
- const std::string name =
- SyncerProtoUtil::NameFromSyncEntity(entry);
+ const std::string name = SyncerProtoUtil::NameFromSyncEntity(entry);
WriteTransaction trans(dir, SYNCER, __FILE__, __LINE__);
« no previous file with comments | « chrome/browser/sync/engine/model_safe_worker.h ('k') | chrome/browser/sync/engine/syncapi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698