diff options
Diffstat (limited to 'sync/protocol')
-rw-r--r-- | sync/protocol/proto_enum_conversions.h | 30 | ||||
-rw-r--r-- | sync/protocol/proto_value_conversions.h | 121 |
2 files changed, 84 insertions, 67 deletions
diff --git a/sync/protocol/proto_enum_conversions.h b/sync/protocol/proto_enum_conversions.h index c379d01..e19fe6b 100644 --- a/sync/protocol/proto_enum_conversions.h +++ b/sync/protocol/proto_enum_conversions.h @@ -22,19 +22,20 @@ namespace syncer { // The returned strings (which don't have to be freed) are in ASCII. // The result of passing in an invalid enum value is undefined. -SYNC_EXPORT const char* GetAppListItemTypeString( +SYNC_EXPORT_PRIVATE const char* GetAppListItemTypeString( sync_pb::AppListSpecifics::AppListItemType item_type); -SYNC_EXPORT const char* GetBrowserTypeString( +SYNC_EXPORT_PRIVATE const char* GetBrowserTypeString( sync_pb::SessionWindow::BrowserType browser_type); -SYNC_EXPORT const char* GetPageTransitionString( +SYNC_EXPORT_PRIVATE const char* GetPageTransitionString( sync_pb::SyncEnums::PageTransition page_transition); -SYNC_EXPORT const char* GetPageTransitionRedirectTypeString( - sync_pb::SyncEnums::PageTransitionRedirectType redirect_type); +SYNC_EXPORT_PRIVATE const char* GetPageTransitionRedirectTypeString( + sync_pb::SyncEnums::PageTransitionRedirectType + redirect_type); -SYNC_EXPORT const char* GetWifiCredentialSecurityClassString( +SYNC_EXPORT_PRIVATE const char* GetWifiCredentialSecurityClassString( sync_pb::WifiCredentialSpecifics::SecurityClass security_class); SYNC_EXPORT const char* GetUpdatesSourceString( @@ -43,27 +44,28 @@ SYNC_EXPORT const char* GetUpdatesSourceString( SYNC_EXPORT const char* GetUpdatesOriginString( sync_pb::SyncEnums::GetUpdatesOrigin origin); -SYNC_EXPORT const char* GetResponseTypeString( +SYNC_EXPORT_PRIVATE const char* GetResponseTypeString( sync_pb::CommitResponse::ResponseType response_type); -SYNC_EXPORT const char* GetErrorTypeString( +SYNC_EXPORT_PRIVATE const char* GetErrorTypeString( sync_pb::SyncEnums::ErrorType error_type); -SYNC_EXPORT const char* GetActionString(sync_pb::SyncEnums::Action action); +SYNC_EXPORT_PRIVATE const char* GetActionString( + sync_pb::SyncEnums::Action action); -SYNC_EXPORT const char* GetLaunchTypeString( +SYNC_EXPORT_PRIVATE const char* GetLaunchTypeString( sync_pb::AppSpecifics::LaunchType launch_type); -SYNC_EXPORT const char* GetWalletInfoTypeString( +SYNC_EXPORT_PRIVATE const char* GetWalletInfoTypeString( sync_pb::AutofillWalletSpecifics::WalletInfoType wallet_info_type); -SYNC_EXPORT const char* GetWalletMetadataTypeString( +SYNC_EXPORT_PRIVATE const char* GetWalletMetadataTypeString( sync_pb::WalletMetadataSpecifics::Type wallet_metadata_type); -SYNC_EXPORT const char* GetWalletCardStatusString( +SYNC_EXPORT_PRIVATE const char* GetWalletCardStatusString( sync_pb::WalletMaskedCreditCard::WalletCardStatus wallet_card_status); -SYNC_EXPORT const char* GetWalletCardTypeString( +SYNC_EXPORT_PRIVATE const char* GetWalletCardTypeString( sync_pb::WalletMaskedCreditCard::WalletCardType wallet_card_type); const char* GetDeviceTypeString(sync_pb::SyncEnums::DeviceType device_type); diff --git a/sync/protocol/proto_value_conversions.h b/sync/protocol/proto_value_conversions.h index 7a831bd..9ba4563 100644 --- a/sync/protocol/proto_value_conversions.h +++ b/sync/protocol/proto_value_conversions.h @@ -95,40 +95,41 @@ namespace syncer { // caller. // TODO(akalin): Perhaps extend this to decrypt? -SYNC_EXPORT scoped_ptr<base::DictionaryValue> EncryptedDataToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> EncryptedDataToValue( const sync_pb::EncryptedData& encrypted_data); // Sub-protocol of AppListSpecifics. -SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppListSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AppListSpecificsToValue( const sync_pb::AppListSpecifics& proto); // Sub-protocols of AppSpecifics. -SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppSettingsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AppSettingsToValue( const sync_pb::AppNotificationSettings& app_notification_settings); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> LinkedAppIconInfoToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> LinkedAppIconInfoToValue( const sync_pb::LinkedAppIconInfo& linked_app_icon_info); // Sub-protocols of SessionSpecifics. -SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionHeaderToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SessionHeaderToValue( const sync_pb::SessionHeader& session_header); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionTabToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SessionTabToValue( const sync_pb::SessionTab& session_tab); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionWindowToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SessionWindowToValue( const sync_pb::SessionWindow& session_window); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> TabNavigationToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> TabNavigationToValue( const sync_pb::TabNavigation& tab_navigation); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> NavigationRedirectToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> NavigationRedirectToValue( const sync_pb::NavigationRedirect& navigation_redirect); // Sub-protocol of PasswordSpecifics. -SYNC_EXPORT scoped_ptr<base::DictionaryValue> PasswordSpecificsDataToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +PasswordSpecificsDataToValue( const sync_pb::PasswordSpecificsData& password_specifics_data); // Sub-protocol of NigoriSpecifics. @@ -149,61 +150,69 @@ scoped_ptr<base::DictionaryValue> TimeRangeDirectiveToValue( scoped_ptr<base::DictionaryValue> KeystoreEncryptionToValue( const sync_pb::KeystoreEncryptionFlagsSpecifics& proto); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> SessionSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SessionSpecificsToValue( const sync_pb::SessionSpecifics& session_specifics); // Main *SpecificsToValue functions. -SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppNotificationToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AppNotificationToValue( const sync_pb::AppNotification& app_notification_specifics); scoped_ptr<base::DictionaryValue> AppSettingSpecificsToValue( const sync_pb::AppSettingSpecifics& app_setting_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> AppSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AppSpecificsToValue( const sync_pb::AppSpecifics& app_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> ArticleSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> ArticleSpecificsToValue( const sync_pb::ArticleSpecifics& article_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> AutofillSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AutofillSpecificsToValue( const sync_pb::AutofillSpecifics& autofill_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> AutofillProfileSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +AutofillProfileSpecificsToValue( const sync_pb::AutofillProfileSpecifics& autofill_profile_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> WalletMetadataSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +WalletMetadataSpecificsToValue( const sync_pb::WalletMetadataSpecifics& wallet_metadata_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> AutofillWalletSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +AutofillWalletSpecificsToValue( const sync_pb::AutofillWalletSpecifics& autofill_wallet_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> BookmarkSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> BookmarkSpecificsToValue( const sync_pb::BookmarkSpecifics& bookmark_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> DeviceInfoSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +DeviceInfoSpecificsToValue( const sync_pb::DeviceInfoSpecifics& device_info_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> DictionarySpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +DictionarySpecificsToValue( const sync_pb::DictionarySpecifics& dictionary_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> ExperimentsSpecificsToValue( - const sync_pb::ExperimentsSpecifics& proto); +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +ExperimentsSpecificsToValue(const sync_pb::ExperimentsSpecifics& proto); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> PriorityPreferenceSpecificsToValue( const sync_pb::PriorityPreferenceSpecifics& proto); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> ExtensionSettingSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +ExtensionSettingSpecificsToValue( const sync_pb::ExtensionSettingSpecifics& extension_setting_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> ExtensionSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> ExtensionSpecificsToValue( const sync_pb::ExtensionSpecifics& extension_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> FaviconImageSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +FaviconImageSpecificsToValue( const sync_pb::FaviconImageSpecifics& favicon_image_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> FaviconTrackingSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +FaviconTrackingSpecificsToValue( const sync_pb::FaviconTrackingSpecifics& favicon_tracking_specifics); SYNC_EXPORT scoped_ptr<base::DictionaryValue> @@ -211,78 +220,84 @@ HistoryDeleteDirectiveSpecificsToValue( const sync_pb::HistoryDeleteDirectiveSpecifics& history_delete_directive_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> ManagedUserSettingSpecificsToValue( const sync_pb::ManagedUserSettingSpecifics& managed_user_setting_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> ManagedUserSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +ManagedUserSpecificsToValue( const sync_pb::ManagedUserSpecifics& managed_user_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> ManagedUserSharedSettingSpecificsToValue( const sync_pb::ManagedUserSharedSettingSpecifics& managed_user_shared_setting_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> ManagedUserWhitelistSpecificsToValue( const sync_pb::ManagedUserWhitelistSpecifics& managed_user_whitelist_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> MediaToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> MediaToValue( const sync_pb::Media& media); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> NigoriSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> NigoriSpecificsToValue( const sync_pb::NigoriSpecifics& nigori_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> PasswordSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> PasswordSpecificsToValue( const sync_pb::PasswordSpecifics& password_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> PreferenceSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +PreferenceSpecificsToValue( const sync_pb::PreferenceSpecifics& password_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SyncedNotificationAppInfoSpecificsToValue( const sync_pb::SyncedNotificationAppInfoSpecifics& synced_notification_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SyncedNotificationSpecificsToValue( const sync_pb::SyncedNotificationSpecifics& synced_notification_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> SearchEngineSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +SearchEngineSpecificsToValue( const sync_pb::SearchEngineSpecifics& search_engine_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> ThemeSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> ThemeSpecificsToValue( const sync_pb::ThemeSpecifics& theme_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> TypedUrlSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> TypedUrlSpecificsToValue( const sync_pb::TypedUrlSpecifics& typed_url_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> WalletMaskedCreditCardToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +WalletMaskedCreditCardToValue( const sync_pb::WalletMaskedCreditCard& wallet_masked_card); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> WalletPostalAddressToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +WalletPostalAddressToValue( const sync_pb::WalletPostalAddress& wallet_postal_address); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> WifiCredentialSpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +WifiCredentialSpecificsToValue( const sync_pb::WifiCredentialSpecifics& wifi_credential_specifics); // Any present extensions are mapped to sub-dictionary values with the // key equal to the extension name. -SYNC_EXPORT scoped_ptr<base::DictionaryValue> EntitySpecificsToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> EntitySpecificsToValue( const sync_pb::EntitySpecifics& specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> SyncEntityToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> SyncEntityToValue( const sync_pb::SyncEntity& entity, bool include_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> ClientToServerMessageToValue( - const sync_pb::ClientToServerMessage& proto, - bool include_specifics); +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +ClientToServerMessageToValue(const sync_pb::ClientToServerMessage& proto, + bool include_specifics); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> ClientToServerResponseToValue( - const sync_pb::ClientToServerResponse& proto, - bool include_specifics); +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> +ClientToServerResponseToValue(const sync_pb::ClientToServerResponse& proto, + bool include_specifics); scoped_ptr<base::DictionaryValue> DatatypeAssociationStatsToValue( const sync_pb::DatatypeAssociationStats& proto); @@ -299,7 +314,7 @@ scoped_ptr<base::DictionaryValue> SyncCycleCompletedEventInfoToValue( scoped_ptr<base::DictionaryValue> ClientConfigParamsToValue( const sync_pb::ClientConfigParams& proto); -SYNC_EXPORT scoped_ptr<base::DictionaryValue> AttachmentIdProtoToValue( +SYNC_EXPORT_PRIVATE scoped_ptr<base::DictionaryValue> AttachmentIdProtoToValue( const sync_pb::AttachmentIdProto& proto); } // namespace syncer |