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

Unified Diff: chrome/browser/extensions/settings/setting_sync_data.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/setting_sync_data.cc
diff --git a/chrome/browser/extensions/settings/setting_sync_data.cc b/chrome/browser/extensions/settings/setting_sync_data.cc
index e5329c1417c8f16abb7005329b60d079ed777d36..54546b4fe5b50b95330ada706d052b0b3d473f0f 100644
--- a/chrome/browser/extensions/settings/setting_sync_data.cc
+++ b/chrome/browser/extensions/settings/setting_sync_data.cc
@@ -14,17 +14,18 @@
namespace extensions {
SettingSyncData::SettingSyncData(
- const SyncChange& sync_change) {
+ const csync::SyncChange& sync_change) {
Init(sync_change.change_type(), sync_change.sync_data());
}
SettingSyncData::SettingSyncData(
- const SyncData& sync_data) {
- Init(SyncChange::ACTION_INVALID, sync_data);
+ const csync::SyncData& sync_data) {
+ Init(csync::SyncChange::ACTION_INVALID, sync_data);
}
void SettingSyncData::Init(
- SyncChange::SyncChangeType change_type, const SyncData& sync_data) {
+ csync::SyncChange::SyncChangeType change_type,
+ const csync::SyncData& sync_data) {
DCHECK(!internal_.get());
sync_pb::EntitySpecifics specifics = sync_data.GetSpecifics();
// The data must only be either extension or app specfics.
@@ -42,7 +43,7 @@ void SettingSyncData::Init(
}
void SettingSyncData::InitFromExtensionSettingSpecifics(
- SyncChange::SyncChangeType change_type,
+ csync::SyncChange::SyncChangeType change_type,
const sync_pb::ExtensionSettingSpecifics& specifics) {
DCHECK(!internal_.get());
scoped_ptr<Value> value(
@@ -60,7 +61,7 @@ void SettingSyncData::InitFromExtensionSettingSpecifics(
}
SettingSyncData::SettingSyncData(
- SyncChange::SyncChangeType change_type,
+ csync::SyncChange::SyncChangeType change_type,
const std::string& extension_id,
const std::string& key,
scoped_ptr<Value> value)
@@ -68,7 +69,7 @@ SettingSyncData::SettingSyncData(
SettingSyncData::~SettingSyncData() {}
-SyncChange::SyncChangeType SettingSyncData::change_type() const {
+csync::SyncChange::SyncChangeType SettingSyncData::change_type() const {
return internal_->change_type_;
}
@@ -85,7 +86,7 @@ const Value& SettingSyncData::value() const {
}
SettingSyncData::Internal::Internal(
- SyncChange::SyncChangeType change_type,
+ csync::SyncChange::SyncChangeType change_type,
const std::string& extension_id,
const std::string& key,
scoped_ptr<Value> value)
« no previous file with comments | « chrome/browser/extensions/settings/setting_sync_data.h ('k') | chrome/browser/extensions/settings/settings_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698