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

Unified Diff: chrome/browser/prefs/pref_model_associator.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 | « chrome/browser/prefs/pref_model_associator.h ('k') | chrome/browser/search_engines/template_url_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_model_associator.cc
diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc
index 04bd97a94d3152aba6b165b68e4166b4118644a8..0ed80e16ec6ed831e8ea51718d2e495b614b15c6 100644
--- a/chrome/browser/prefs/pref_model_associator.cc
+++ b/chrome/browser/prefs/pref_model_associator.cc
@@ -18,7 +18,7 @@
#include "sync/protocol/preference_specifics.pb.h"
#include "sync/protocol/sync.pb.h"
-using syncable::PREFERENCES;
+using syncer::PREFERENCES;
PrefModelAssociator::PrefModelAssociator()
: models_associated_(false),
@@ -107,7 +107,7 @@ void PrefModelAssociator::InitPrefAndAssociate(
}
syncer::SyncError PrefModelAssociator::MergeDataAndStartSyncing(
- syncable::ModelType type,
+ syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) {
@@ -163,7 +163,7 @@ syncer::SyncError PrefModelAssociator::MergeDataAndStartSyncing(
return syncer::SyncError();
}
-void PrefModelAssociator::StopSyncing(syncable::ModelType type) {
+void PrefModelAssociator::StopSyncing(syncer::ModelType type) {
DCHECK_EQ(type, PREFERENCES);
models_associated_ = false;
sync_processor_.reset();
@@ -274,7 +274,7 @@ Value* PrefModelAssociator::MergeDictionaryValues(
// not registered locally as syncable and do not inform the syncer of
// non-user controlled preferences.
syncer::SyncDataList PrefModelAssociator::GetAllSyncData(
- syncable::ModelType type)
+ syncer::ModelType type)
const {
DCHECK_EQ(PREFERENCES, type);
syncer::SyncDataList current_data;
« no previous file with comments | « chrome/browser/prefs/pref_model_associator.h ('k') | chrome/browser/search_engines/template_url_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698