Index: chrome/browser/extensions/extension_sync_data.h |
diff --git a/chrome/browser/extensions/extension_sync_data.h b/chrome/browser/extensions/extension_sync_data.h |
index ef3a92bc647811a87976794cad11cdf577c113b3..6079f1dcb1eea540dfc04a160c141544960a764a 100644 |
--- a/chrome/browser/extensions/extension_sync_data.h |
+++ b/chrome/browser/extensions/extension_sync_data.h |
@@ -13,7 +13,9 @@ |
#include "googleurl/src/gurl.h" |
#include "sync/api/sync_change.h" |
+namespace csync { |
class SyncData; |
+} |
namespace sync_pb { |
class ExtensionSpecifics; |
@@ -24,21 +26,22 @@ namespace extensions { |
class Extension; |
// A class that encapsulates the synced properties of an Extension. |
-class ExtensionSyncData { |
+class ExtensionSyncData { |
asargent_no_longer_on_chrome
2012/06/26 18:08:17
nit: double space
akalin
2012/06/26 20:28:28
Done.
|
public: |
ExtensionSyncData(); |
- explicit ExtensionSyncData(const SyncData& sync_data); |
- explicit ExtensionSyncData(const SyncChange& sync_change); |
+ explicit ExtensionSyncData(const csync::SyncData& sync_data); |
+ explicit ExtensionSyncData(const csync::SyncChange& sync_change); |
ExtensionSyncData(const Extension& extension, |
bool enabled, |
bool incognito_enabled); |
~ExtensionSyncData(); |
// Retrieve 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; |
- // Convert an ExtensionSyncData back out to a sync structure. |
+ // Convert an ExtensionSyncData back out to a sync structure. |
asargent_no_longer_on_chrome
2012/06/26 18:08:17
nit: double space
akalin
2012/06/26 20:28:28
Done.
|
void PopulateExtensionSpecifics(sync_pb::ExtensionSpecifics* specifics) const; |
// Populate this class from sync inputs. |
@@ -65,7 +68,7 @@ class ExtensionSyncData { |
private: |
// Populate this class from sync inputs. |
- void PopulateFromSyncData(const SyncData& sync_data); |
+ void PopulateFromSyncData(const csync::SyncData& sync_data); |
std::string id_; |
bool uninstalled_; |