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

Unified Diff: chrome/browser/extensions/settings/syncable_settings_storage.h

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/syncable_settings_storage.h
diff --git a/chrome/browser/extensions/settings/syncable_settings_storage.h b/chrome/browser/extensions/settings/syncable_settings_storage.h
index 061153eed6e8c7c213a16c9b78630b4b6b765be7..e8403bf2465ce401cb2888a01e7d05c0b5e186e1 100644
--- a/chrome/browser/extensions/settings/syncable_settings_storage.h
+++ b/chrome/browser/extensions/settings/syncable_settings_storage.h
@@ -53,7 +53,7 @@ class SyncableSettingsStorage : public ValueStore {
// can be called.
// Must only be called if sync isn't already active.
- SyncError StartSyncing(
+ csync::SyncError StartSyncing(
const DictionaryValue& sync_state,
scoped_ptr<SettingsSyncProcessor> sync_processor);
@@ -61,32 +61,32 @@ class SyncableSettingsStorage : public ValueStore {
void StopSyncing();
// May be called at any time; changes will be ignored if sync isn't active.
- SyncError ProcessSyncChanges(const SettingSyncDataList& sync_changes);
+ csync::SyncError ProcessSyncChanges(const SettingSyncDataList& sync_changes);
private:
// Sends the changes from |result| to sync if it's enabled.
void SyncResultIfEnabled(const ValueStore::WriteResult& result);
// Sends all local settings to sync (synced settings assumed to be empty).
- SyncError SendLocalSettingsToSync(
+ csync::SyncError SendLocalSettingsToSync(
const DictionaryValue& settings);
// Overwrites local state with sync state.
- SyncError OverwriteLocalSettingsWithSync(
+ csync::SyncError OverwriteLocalSettingsWithSync(
const DictionaryValue& sync_state, const DictionaryValue& settings);
// Called when an Add/Update/Remove comes from sync. Ownership of Value*s
// are taken.
- SyncError OnSyncAdd(
+ csync::SyncError OnSyncAdd(
const std::string& key,
Value* new_value,
ValueStoreChangeList* changes);
- SyncError OnSyncUpdate(
+ csync::SyncError OnSyncUpdate(
const std::string& key,
Value* old_value,
Value* new_value,
ValueStoreChangeList* changes);
- SyncError OnSyncDelete(
+ csync::SyncError OnSyncDelete(
const std::string& key,
Value* old_value,
ValueStoreChangeList* changes);

Powered by Google App Engine
This is Rietveld 408576698