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

Unified Diff: chrome/browser/extensions/settings/settings_sync_util.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_util.cc
diff --git a/chrome/browser/extensions/settings/settings_sync_util.cc b/chrome/browser/extensions/settings/settings_sync_util.cc
index 8bf0fc7b15a6c46c28da3606aca586468c60cc57..53c2d243d04d19cae144e75a11984053194445e6 100644
--- a/chrome/browser/extensions/settings/settings_sync_util.cc
+++ b/chrome/browser/extensions/settings/settings_sync_util.cc
@@ -41,7 +41,7 @@ void PopulateAppSettingSpecifics(
} // namespace
-SyncData CreateData(
+csync::SyncData CreateData(
const std::string& extension_id,
const std::string& key,
const Value& value,
@@ -68,34 +68,38 @@ SyncData CreateData(
NOTREACHED();
}
- return SyncData::CreateLocalData(extension_id + "/" + key, key, specifics);
+ return csync::SyncData::CreateLocalData(
+ extension_id + "/" + key, key, specifics);
}
-SyncChange CreateAdd(
+csync::SyncChange CreateAdd(
const std::string& extension_id,
const std::string& key,
const Value& value,
syncable::ModelType type) {
- return SyncChange(
- SyncChange::ACTION_ADD, CreateData(extension_id, key, value, type));
+ return csync::SyncChange(
+ csync::SyncChange::ACTION_ADD,
+ CreateData(extension_id, key, value, type));
}
-SyncChange CreateUpdate(
+csync::SyncChange CreateUpdate(
const std::string& extension_id,
const std::string& key,
const Value& value,
syncable::ModelType type) {
- return SyncChange(
- SyncChange::ACTION_UPDATE, CreateData(extension_id, key, value, type));
+ return csync::SyncChange(
+ csync::SyncChange::ACTION_UPDATE,
+ CreateData(extension_id, key, value, type));
}
-SyncChange CreateDelete(
+csync::SyncChange CreateDelete(
const std::string& extension_id,
const std::string& key,
syncable::ModelType type) {
DictionaryValue no_value;
- return SyncChange(
- SyncChange::ACTION_DELETE, CreateData(extension_id, key, no_value, type));
+ return csync::SyncChange(
+ csync::SyncChange::ACTION_DELETE,
+ CreateData(extension_id, key, no_value, type));
}
} // namespace settings_sync_util

Powered by Google App Engine
This is Rietveld 408576698