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

Unified Diff: chrome/browser/extensions/settings/settings_sync_processor.cc

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments 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/extensions/settings/settings_sync_processor.cc
diff --git a/chrome/browser/extensions/settings/settings_sync_processor.cc b/chrome/browser/extensions/settings/settings_sync_processor.cc
index f3175b9327c5ee42a1bb509a7af994b65d50ea73..6ea00d0473a76bd1d6ff0c989720c9146d215b66 100644
--- a/chrome/browser/extensions/settings/settings_sync_processor.cc
+++ b/chrome/browser/extensions/settings/settings_sync_processor.cc
@@ -17,7 +17,7 @@ namespace extensions {
SettingsSyncProcessor::SettingsSyncProcessor(
const std::string& extension_id,
syncable::ModelType type,
- SyncChangeProcessor* sync_processor)
+ csync::SyncChangeProcessor* sync_processor)
: extension_id_(extension_id),
type_(type),
sync_processor_(sync_processor),
@@ -42,12 +42,12 @@ void SettingsSyncProcessor::Init(const DictionaryValue& initial_state) {
initialized_ = true;
}
-SyncError SettingsSyncProcessor::SendChanges(
+csync::SyncError SettingsSyncProcessor::SendChanges(
const ValueStoreChangeList& changes) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
CHECK(initialized_) << "Init not called";
- SyncChangeList sync_changes;
+ csync::SyncChangeList sync_changes;
std::set<std::string> added_keys;
std::set<std::string> deleted_keys;
@@ -79,9 +79,9 @@ SyncError SettingsSyncProcessor::SendChanges(
}
if (sync_changes.empty())
- return SyncError();
+ return csync::SyncError();
- SyncError error =
+ csync::SyncError error =
sync_processor_->ProcessSyncChanges(FROM_HERE, sync_changes);
if (error.IsSet())
return error;
@@ -92,7 +92,7 @@ SyncError SettingsSyncProcessor::SendChanges(
synced_keys_.erase(*i);
}
- return SyncError();
+ return csync::SyncError();
}
void SettingsSyncProcessor::NotifyChanges(const ValueStoreChangeList& changes) {

Powered by Google App Engine
This is Rietveld 408576698