Index: chrome/browser/extensions/app_sync_data.h |
diff --git a/chrome/browser/extensions/app_sync_data.h b/chrome/browser/extensions/app_sync_data.h |
index d6c390f201ded65025a7d03c0c2aaa249005b3a9..353acd567807fe8059b3b775b320a703456eeb4c 100644 |
--- a/chrome/browser/extensions/app_sync_data.h |
+++ b/chrome/browser/extensions/app_sync_data.h |
@@ -10,7 +10,10 @@ |
#include "chrome/common/string_ordinal.h" |
#include "sync/api/sync_change.h" |
+namespace csync { |
class SyncData; |
+} |
+ |
namespace sync_pb { |
class AppSpecifics; |
} |
@@ -24,8 +27,8 @@ class ExtensionSyncData; |
class AppSyncData { |
public: |
AppSyncData(); |
- explicit AppSyncData(const SyncData& sync_data); |
- explicit AppSyncData(const SyncChange& sync_change); |
+ explicit AppSyncData(const csync::SyncData& sync_data); |
+ explicit AppSyncData(const csync::SyncChange& sync_change); |
AppSyncData(const Extension& extension, |
bool enabled, |
bool incognito_enabled, |
@@ -36,8 +39,9 @@ class AppSyncData { |
~AppSyncData(); |
// Retrive sync data from this class. |
- SyncData GetSyncData() const; |
- SyncChange GetSyncChange(SyncChange::SyncChangeType change_type) const; |
+ csync::SyncData GetSyncData() const; |
+ csync::SyncChange GetSyncChange( |
+ csync::SyncChange::SyncChangeType change_type) const; |
const std::string& id() const { return extension_sync_data_.id(); } |
@@ -69,7 +73,7 @@ class AppSyncData { |
// Populate this class from sync inputs. |
void PopulateFromAppSpecifics( |
const sync_pb::AppSpecifics& specifics); |
- void PopulateFromSyncData(const SyncData& sync_data); |
+ void PopulateFromSyncData(const csync::SyncData& sync_data); |
ExtensionSyncData extension_sync_data_; |
std::string notifications_client_id_; |