| Index: chrome/browser/extensions/settings/setting_sync_data.h
|
| diff --git a/chrome/browser/extensions/settings/setting_sync_data.h b/chrome/browser/extensions/settings/setting_sync_data.h
|
| index c72f3867ee7cc0c06bc11f66add7af54b4db7507..8b845cb3b4c85988c47bd693faf77621b5645572 100644
|
| --- a/chrome/browser/extensions/settings/setting_sync_data.h
|
| +++ b/chrome/browser/extensions/settings/setting_sync_data.h
|
| @@ -11,7 +11,10 @@
|
| #include "base/values.h"
|
| #include "sync/api/sync_change.h"
|
|
|
| +namespace csync {
|
| class SyncData;
|
| +}
|
| +
|
| namespace sync_pb {
|
| class ExtensionSettingSpecifics;
|
| }
|
| @@ -20,17 +23,17 @@ namespace extensions {
|
|
|
| // Container for data interpreted from sync data/changes for an extension or
|
| // app setting. Safe and efficient to copy.
|
| -class SettingSyncData {
|
| +class SettingSyncData {
|
| public:
|
| // Creates from a sync change.
|
| - explicit SettingSyncData(const SyncChange& sync_change);
|
| + explicit SettingSyncData(const csync::SyncChange& sync_change);
|
|
|
| // Creates from sync data. |change_type| will be ACTION_INVALID.
|
| - explicit SettingSyncData(const SyncData& sync_data);
|
| + explicit SettingSyncData(const csync::SyncData& sync_data);
|
|
|
| // Creates explicitly.
|
| SettingSyncData(
|
| - SyncChange::SyncChangeType change_type,
|
| + csync::SyncChange::SyncChangeType change_type,
|
| const std::string& extension_id,
|
| const std::string& key,
|
| scoped_ptr<Value> value);
|
| @@ -38,7 +41,7 @@ class SettingSyncData {
|
| ~SettingSyncData();
|
|
|
| // Returns the type of the sync change; may be ACTION_INVALID.
|
| - SyncChange::SyncChangeType change_type() const;
|
| + csync::SyncChange::SyncChangeType change_type() const;
|
|
|
| // Returns the extension id the setting is for.
|
| const std::string& extension_id() const;
|
| @@ -55,12 +58,12 @@ class SettingSyncData {
|
| class Internal : public base::RefCountedThreadSafe<Internal> {
|
| public:
|
| Internal(
|
| - SyncChange::SyncChangeType change_type,
|
| + csync::SyncChange::SyncChangeType change_type,
|
| const std::string& extension_id,
|
| const std::string& key,
|
| scoped_ptr<Value> value);
|
|
|
| - SyncChange::SyncChangeType change_type_;
|
| + csync::SyncChange::SyncChangeType change_type_;
|
| std::string extension_id_;
|
| std::string key_;
|
| scoped_ptr<Value> value_;
|
| @@ -71,11 +74,12 @@ class SettingSyncData {
|
| };
|
|
|
| // Initializes internal_ from sync data for an extension or app setting.
|
| - void Init(SyncChange::SyncChangeType change_type, const SyncData& sync_data);
|
| + void Init(csync::SyncChange::SyncChangeType change_type,
|
| + const csync::SyncData& sync_data);
|
|
|
| // Initializes internal_ from extension specifics.
|
| void InitFromExtensionSettingSpecifics(
|
| - SyncChange::SyncChangeType change_type,
|
| + csync::SyncChange::SyncChangeType change_type,
|
| const sync_pb::ExtensionSettingSpecifics& specifics);
|
|
|
| scoped_refptr<Internal> internal_;
|
|
|