| Index: chrome/browser/sync/profile_sync_factory_impl.h
|
| diff --git a/chrome/browser/sync/profile_sync_factory_impl.h b/chrome/browser/sync/profile_sync_factory_impl.h
|
| index 87d3102a11e81a1683897b7badd73785ac285e23..426dd8708136410b0a288612b42e77fc69d90af3 100644
|
| --- a/chrome/browser/sync/profile_sync_factory_impl.h
|
| +++ b/chrome/browser/sync/profile_sync_factory_impl.h
|
| @@ -9,6 +9,7 @@
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/compiler_specific.h"
|
| #include "chrome/browser/sync/profile_sync_factory.h"
|
|
|
| class CommandLine;
|
| @@ -21,75 +22,76 @@ class ProfileSyncFactoryImpl : public ProfileSyncFactory {
|
|
|
| // ProfileSyncFactory interface.
|
| virtual ProfileSyncService* CreateProfileSyncService(
|
| - const std::string& cros_user);
|
| + const std::string& cros_user) OVERRIDE;
|
|
|
| - virtual void RegisterDataTypes(ProfileSyncService* pss);
|
| + virtual void RegisterDataTypes(ProfileSyncService* pss) OVERRIDE;
|
|
|
| virtual browser_sync::DataTypeManager* CreateDataTypeManager(
|
| browser_sync::SyncBackendHost* backend,
|
| - const browser_sync::DataTypeController::TypeMap* controllers);
|
| + const browser_sync::DataTypeController::TypeMap* controllers) OVERRIDE;
|
|
|
| virtual browser_sync::GenericChangeProcessor* CreateGenericChangeProcessor(
|
| ProfileSyncService* profile_sync_service,
|
| browser_sync::UnrecoverableErrorHandler* error_handler,
|
| - const base::WeakPtr<SyncableService>& local_service);
|
| + const base::WeakPtr<SyncableService>& local_service) OVERRIDE;
|
|
|
| - virtual browser_sync::SharedChangeProcessor* CreateSharedChangeProcessor();
|
| + virtual browser_sync::SharedChangeProcessor*
|
| + CreateSharedChangeProcessor() OVERRIDE;
|
|
|
| virtual SyncComponents CreateAppSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual base::WeakPtr<SyncableService> GetAutofillProfileSyncableService(
|
| - WebDataService* web_data_service) const;
|
| + WebDataService* web_data_service) const OVERRIDE;
|
|
|
| virtual base::WeakPtr<SyncableService> GetAutocompleteSyncableService(
|
| - WebDataService* web_data_service) const;
|
| + WebDataService* web_data_service) const OVERRIDE;
|
|
|
| virtual SyncComponents CreateBookmarkSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual SyncComponents CreateExtensionOrAppSettingSyncComponents(
|
| // Either EXTENSION_SETTING or APP_SETTING.
|
| syncable::ModelType type,
|
| SyncableService* settings_service,
|
| ProfileSyncService* profile_sync_service,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual SyncComponents CreateExtensionSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual SyncComponents CreatePasswordSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| PasswordStore* password_store,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual SyncComponents CreatePreferenceSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual SyncComponents CreateThemeSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual SyncComponents CreateTypedUrlSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| history::HistoryBackend* history_backend,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual SyncComponents CreateSessionSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual SyncComponents CreateSearchEngineSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| virtual SyncComponents CreateAppNotificationSyncComponents(
|
| ProfileSyncService* profile_sync_service,
|
| - browser_sync::UnrecoverableErrorHandler* error_handler);
|
| + browser_sync::UnrecoverableErrorHandler* error_handler) OVERRIDE;
|
|
|
| private:
|
| Profile* profile_;
|
|
|