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

Unified Diff: chrome/browser/sync/backend_migrator.cc

Issue 11958029: [Sync] Add support for proxy types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 7 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
Index: chrome/browser/sync/backend_migrator.cc
diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc
index e6c50020f33aa9cecddf72777bd0882c3e5f2533..8d5d1ea710439b655c61ddb45ef5fdc0108bbb64 100644
--- a/chrome/browser/sync/backend_migrator.cc
+++ b/chrome/browser/sync/backend_migrator.cc
@@ -46,6 +46,10 @@ BackendMigrator::~BackendMigrator() {
#define SDVLOG(verbose_level) DVLOG(verbose_level) << name_ << ": "
void BackendMigrator::MigrateTypes(syncer::ModelTypeSet types) {
+ if (!syncer::Intersection(types, syncer::VirtualTypes()).Empty()) {
+ LOG(WARNING) << "Virtual type migration attempted, dropping local types.";
+ types.RemoveAll(syncer::VirtualTypes());
+ }
const ModelTypeSet old_to_migrate = to_migrate_;
to_migrate_.PutAll(types);
SDVLOG(1) << "MigrateTypes called with " << ModelTypeSetToString(types)
« no previous file with comments | « no previous file | chrome/browser/sync/glue/sync_backend_host.cc » ('j') | sync/internal_api/sync_manager_impl_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698