| Index: components/browser_sync/browser/profile_sync_components_factory_impl.h
|
| diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.h b/components/browser_sync/browser/profile_sync_components_factory_impl.h
|
| similarity index 74%
|
| rename from chrome/browser/sync/profile_sync_components_factory_impl.h
|
| rename to components/browser_sync/browser/profile_sync_components_factory_impl.h
|
| index 0e7ede71bd8381ed2f76c39faed75d4772ed8033..579d1b9cb7c8d04f83fb7a7b58865ae1397f1dbd 100644
|
| --- a/chrome/browser/sync/profile_sync_components_factory_impl.h
|
| +++ b/components/browser_sync/browser/profile_sync_components_factory_impl.h
|
| @@ -2,25 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__
|
| -#define CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__
|
| +#ifndef COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__
|
| +#define COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__
|
|
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/command_line.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "components/sync_driver/sync_api_component_factory.h"
|
| +#include "components/version_info/version_info.h"
|
| #include "sync/internal_api/public/base/model_type.h"
|
| #include "url/gurl.h"
|
|
|
| class OAuth2TokenService;
|
| class Profile;
|
|
|
| -namespace base {
|
| -class CommandLine;
|
| -}
|
| -
|
| namespace net {
|
| class URLRequestContextGetter;
|
| }
|
| @@ -37,15 +35,22 @@ class ProfileSyncComponentsFactoryImpl
|
| // |url_request_context_getter| must outlive the
|
| // ProfileSyncComponentsFactoryImpl.
|
| ProfileSyncComponentsFactoryImpl(
|
| - Profile* profile,
|
| - base::CommandLine* command_line,
|
| + sync_driver::SyncClient* sync_client,
|
| + version_info::Channel channel,
|
| + const std::string& version,
|
| + bool is_tablet,
|
| + const base::CommandLine& command_line,
|
| + const char* history_disabled_pref,
|
| const GURL& sync_service_url,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& db_thread,
|
| OAuth2TokenService* token_service,
|
| net::URLRequestContextGetter* url_request_context_getter);
|
| ~ProfileSyncComponentsFactoryImpl() override;
|
|
|
| - void RegisterDataTypes(sync_driver::SyncClient* sync_client) override;
|
| -
|
| + // SyncApiComponentFactory implementation:
|
| + void RegisterDataTypes(
|
| + const RegisterDataTypesMethod& register_platform_types_method) override;
|
| sync_driver::DataTypeManager* CreateDataTypeManager(
|
| const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&
|
| debug_info_listener,
|
| @@ -53,25 +58,19 @@ class ProfileSyncComponentsFactoryImpl
|
| const sync_driver::DataTypeEncryptionHandler* encryption_handler,
|
| browser_sync::SyncBackendHost* backend,
|
| sync_driver::DataTypeManagerObserver* observer) override;
|
| -
|
| browser_sync::SyncBackendHost* CreateSyncBackendHost(
|
| const std::string& name,
|
| - sync_driver::SyncClient* sync_client,
|
| invalidation::InvalidationService* invalidator,
|
| const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,
|
| const base::FilePath& sync_folder) override;
|
| -
|
| scoped_ptr<sync_driver::LocalDeviceInfoProvider>
|
| CreateLocalDeviceInfoProvider() override;
|
| -
|
| scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
|
| scoped_ptr<syncer::AttachmentStoreForSync> attachment_store,
|
| const syncer::UserShare& user_share,
|
| const std::string& store_birthday,
|
| syncer::ModelType model_type,
|
| syncer::AttachmentService::Delegate* delegate) override;
|
| -
|
| - // Legacy datatypes that need to be converted to the SyncableService API.
|
| sync_driver::SyncApiComponentFactory::SyncComponents
|
| CreateBookmarkSyncComponents(
|
| sync_driver::SyncService* sync_service,
|
| @@ -83,28 +82,26 @@ class ProfileSyncComponentsFactoryImpl
|
| sync_driver::DataTypeErrorHandler* error_handler) override;
|
|
|
| private:
|
| - // Register data types which are enabled on desktop platforms only.
|
| - // |disabled_types| and |enabled_types| correspond only to those types
|
| - // being explicitly enabled/disabled by the command line.
|
| - void RegisterDesktopDataTypes(syncer::ModelTypeSet disabled_types,
|
| - syncer::ModelTypeSet enabled_types,
|
| - sync_driver::SyncClient* sync_client);
|
| -
|
| // Register data types which are enabled on both desktop and mobile.
|
| // |disabled_types| and |enabled_types| correspond only to those types
|
| // being explicitly enabled/disabled by the command line.
|
| void RegisterCommonDataTypes(syncer::ModelTypeSet disabled_types,
|
| - syncer::ModelTypeSet enabled_types,
|
| - sync_driver::SyncClient* sync_client);
|
| + syncer::ModelTypeSet enabled_types);
|
|
|
| void DisableBrokenType(syncer::ModelType type,
|
| const tracked_objects::Location& from_here,
|
| const std::string& message);
|
|
|
| - Profile* profile_;
|
| - base::CommandLine* command_line_;
|
| -
|
| + // Client/platform specific members.
|
| + sync_driver::SyncClient* const sync_client_;
|
| + const version_info::Channel channel_;
|
| + const std::string version_;
|
| + const bool is_tablet_;
|
| + const base::CommandLine command_line_;
|
| + const char* history_disabled_pref_;
|
| const GURL sync_service_url_;
|
| + const scoped_refptr<base::SingleThreadTaskRunner> ui_thread_;
|
| + const scoped_refptr<base::SingleThreadTaskRunner> db_thread_;
|
| OAuth2TokenService* const token_service_;
|
| net::URLRequestContextGetter* const url_request_context_getter_;
|
|
|
| @@ -113,4 +110,4 @@ class ProfileSyncComponentsFactoryImpl
|
| DISALLOW_COPY_AND_ASSIGN(ProfileSyncComponentsFactoryImpl);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__
|
| +#endif // COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_COMPONENTS_FACTORY_IMPL_H__
|
|
|