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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/settings/setting_sync_data.h" 5 #include "chrome/browser/extensions/settings/setting_sync_data.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "sync/api/sync_data.h" 9 #include "sync/api/sync_data.h"
10 #include "sync/protocol/app_setting_specifics.pb.h" 10 #include "sync/protocol/app_setting_specifics.pb.h"
11 #include "sync/protocol/extension_setting_specifics.pb.h" 11 #include "sync/protocol/extension_setting_specifics.pb.h"
12 #include "sync/protocol/sync.pb.h" 12 #include "sync/protocol/sync.pb.h"
13 13
14 namespace extensions { 14 namespace extensions {
15 15
16 SettingSyncData::SettingSyncData( 16 SettingSyncData::SettingSyncData(
17 const SyncChange& sync_change) { 17 const csync::SyncChange& sync_change) {
18 Init(sync_change.change_type(), sync_change.sync_data()); 18 Init(sync_change.change_type(), sync_change.sync_data());
19 } 19 }
20 20
21 SettingSyncData::SettingSyncData( 21 SettingSyncData::SettingSyncData(
22 const SyncData& sync_data) { 22 const csync::SyncData& sync_data) {
23 Init(SyncChange::ACTION_INVALID, sync_data); 23 Init(csync::SyncChange::ACTION_INVALID, sync_data);
24 } 24 }
25 25
26 void SettingSyncData::Init( 26 void SettingSyncData::Init(
27 SyncChange::SyncChangeType change_type, const SyncData& sync_data) { 27 csync::SyncChange::SyncChangeType change_type,
28 const csync::SyncData& sync_data) {
28 DCHECK(!internal_.get()); 29 DCHECK(!internal_.get());
29 sync_pb::EntitySpecifics specifics = sync_data.GetSpecifics(); 30 sync_pb::EntitySpecifics specifics = sync_data.GetSpecifics();
30 // The data must only be either extension or app specfics. 31 // The data must only be either extension or app specfics.
31 DCHECK_NE(specifics.has_extension_setting(), 32 DCHECK_NE(specifics.has_extension_setting(),
32 specifics.has_app_setting()); 33 specifics.has_app_setting());
33 if (specifics.has_extension_setting()) { 34 if (specifics.has_extension_setting()) {
34 InitFromExtensionSettingSpecifics( 35 InitFromExtensionSettingSpecifics(
35 change_type, 36 change_type,
36 specifics.extension_setting()); 37 specifics.extension_setting());
37 } else if (specifics.has_app_setting()) { 38 } else if (specifics.has_app_setting()) {
38 InitFromExtensionSettingSpecifics( 39 InitFromExtensionSettingSpecifics(
39 change_type, 40 change_type,
40 specifics.app_setting().extension_setting()); 41 specifics.app_setting().extension_setting());
41 } 42 }
42 } 43 }
43 44
44 void SettingSyncData::InitFromExtensionSettingSpecifics( 45 void SettingSyncData::InitFromExtensionSettingSpecifics(
45 SyncChange::SyncChangeType change_type, 46 csync::SyncChange::SyncChangeType change_type,
46 const sync_pb::ExtensionSettingSpecifics& specifics) { 47 const sync_pb::ExtensionSettingSpecifics& specifics) {
47 DCHECK(!internal_.get()); 48 DCHECK(!internal_.get());
48 scoped_ptr<Value> value( 49 scoped_ptr<Value> value(
49 base::JSONReader::Read(specifics.value())); 50 base::JSONReader::Read(specifics.value()));
50 if (!value.get()) { 51 if (!value.get()) {
51 LOG(WARNING) << "Specifics for " << specifics.extension_id() << "/" << 52 LOG(WARNING) << "Specifics for " << specifics.extension_id() << "/" <<
52 specifics.key() << " had bad JSON for value: " << specifics.value(); 53 specifics.key() << " had bad JSON for value: " << specifics.value();
53 value.reset(new DictionaryValue()); 54 value.reset(new DictionaryValue());
54 } 55 }
55 internal_ = new Internal( 56 internal_ = new Internal(
56 change_type, 57 change_type,
57 specifics.extension_id(), 58 specifics.extension_id(),
58 specifics.key(), 59 specifics.key(),
59 value.Pass()); 60 value.Pass());
60 } 61 }
61 62
62 SettingSyncData::SettingSyncData( 63 SettingSyncData::SettingSyncData(
63 SyncChange::SyncChangeType change_type, 64 csync::SyncChange::SyncChangeType change_type,
64 const std::string& extension_id, 65 const std::string& extension_id,
65 const std::string& key, 66 const std::string& key,
66 scoped_ptr<Value> value) 67 scoped_ptr<Value> value)
67 : internal_(new Internal(change_type, extension_id, key, value.Pass())) {} 68 : internal_(new Internal(change_type, extension_id, key, value.Pass())) {}
68 69
69 SettingSyncData::~SettingSyncData() {} 70 SettingSyncData::~SettingSyncData() {}
70 71
71 SyncChange::SyncChangeType SettingSyncData::change_type() const { 72 csync::SyncChange::SyncChangeType SettingSyncData::change_type() const {
72 return internal_->change_type_; 73 return internal_->change_type_;
73 } 74 }
74 75
75 const std::string& SettingSyncData::extension_id() const { 76 const std::string& SettingSyncData::extension_id() const {
76 return internal_->extension_id_; 77 return internal_->extension_id_;
77 } 78 }
78 79
79 const std::string& SettingSyncData::key() const { 80 const std::string& SettingSyncData::key() const {
80 return internal_->key_; 81 return internal_->key_;
81 } 82 }
82 83
83 const Value& SettingSyncData::value() const { 84 const Value& SettingSyncData::value() const {
84 return *internal_->value_; 85 return *internal_->value_;
85 } 86 }
86 87
87 SettingSyncData::Internal::Internal( 88 SettingSyncData::Internal::Internal(
88 SyncChange::SyncChangeType change_type, 89 csync::SyncChange::SyncChangeType change_type,
89 const std::string& extension_id, 90 const std::string& extension_id,
90 const std::string& key, 91 const std::string& key,
91 scoped_ptr<Value> value) 92 scoped_ptr<Value> value)
92 : change_type_(change_type), 93 : change_type_(change_type),
93 extension_id_(extension_id), 94 extension_id_(extension_id),
94 key_(key), 95 key_(key),
95 value_(value.Pass()) { 96 value_(value.Pass()) {
96 DCHECK(value_.get()); 97 DCHECK(value_.get());
97 } 98 }
98 99
99 SettingSyncData::Internal::~Internal() {} 100 SettingSyncData::Internal::~Internal() {}
100 101
101 } // namespace extensions 102 } // namespace extensions
OLDNEW
« 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