| Index: components/sync/driver/glue/sync_backend_host_impl.h
|
| diff --git a/components/sync_driver/glue/sync_backend_host_impl.h b/components/sync/driver/glue/sync_backend_host_impl.h
|
| similarity index 95%
|
| rename from components/sync_driver/glue/sync_backend_host_impl.h
|
| rename to components/sync/driver/glue/sync_backend_host_impl.h
|
| index cb899610461814cf68aa1a6d86b6dd5eaae28d07..1345b9f3c9ce705eca4c5074ac906cd502d1c520 100644
|
| --- a/components/sync_driver/glue/sync_backend_host_impl.h
|
| +++ b/components/sync/driver/glue/sync_backend_host_impl.h
|
| @@ -25,12 +25,12 @@
|
| #include "components/sync/base/weak_handle.h"
|
| #include "components/sync/core/configure_reason.h"
|
| #include "components/sync/core/sync_manager.h"
|
| +#include "components/sync/driver/backend_data_type_configurer.h"
|
| +#include "components/sync/driver/glue/sync_backend_host.h"
|
| #include "components/sync/protocol/encryption.pb.h"
|
| #include "components/sync/protocol/sync_protocol_error.h"
|
| #include "components/sync/sessions/sync_session_snapshot.h"
|
| #include "components/sync/sessions/type_debug_info_observer.h"
|
| -#include "components/sync_driver/backend_data_type_configurer.h"
|
| -#include "components/sync_driver/glue/sync_backend_host.h"
|
|
|
| class GURL;
|
|
|
| @@ -61,9 +61,8 @@ struct DoInitializeOptions;
|
|
|
| // The only real implementation of the SyncBackendHost. See that interface's
|
| // definition for documentation of public methods.
|
| -class SyncBackendHostImpl
|
| - : public SyncBackendHost,
|
| - public syncer::InvalidationHandler {
|
| +class SyncBackendHostImpl : public SyncBackendHost,
|
| + public syncer::InvalidationHandler {
|
| public:
|
| typedef syncer::SyncStatus Status;
|
|
|
| @@ -174,8 +173,8 @@ class SyncBackendHostImpl
|
| syncer::ModelTypeSet to_unapply,
|
| syncer::ModelTypeSet to_ignore,
|
| const syncer::ModelSafeRoutingInfo& routing_info,
|
| - const base::Callback<void(syncer::ModelTypeSet,
|
| - syncer::ModelTypeSet)>& ready_task,
|
| + const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
|
| + ready_task,
|
| const base::Closure& retry_callback);
|
|
|
| // Called when the syncer has finished performing a configuration.
|
| @@ -183,8 +182,8 @@ class SyncBackendHostImpl
|
| const syncer::ModelTypeSet enabled_types,
|
| const syncer::ModelTypeSet succeeded_configuration_types,
|
| const syncer::ModelTypeSet failed_configuration_types,
|
| - const base::Callback<void(syncer::ModelTypeSet,
|
| - syncer::ModelTypeSet)>& ready_task);
|
| + const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
|
| + ready_task);
|
|
|
| // Reports backend initialization success. Includes some objects from sync
|
| // manager initialization to be passed back to the UI thread.
|
| @@ -229,9 +228,7 @@ class SyncBackendHostImpl
|
| void UpdateInvalidationVersions(
|
| const std::map<syncer::ModelType, int64_t>& invalidation_versions);
|
|
|
| - sync_driver::SyncFrontend* frontend() {
|
| - return frontend_;
|
| - }
|
| + sync_driver::SyncFrontend* frontend() { return frontend_; }
|
|
|
| private:
|
| friend class SyncBackendHostCore;
|
| @@ -258,9 +255,8 @@ class SyncBackendHostImpl
|
| // across browser restart to avoid requiring the user to re-enter their
|
| // passphrase. |token| must be valid UTF-8 as we use the PrefService for
|
| // storage.
|
| - void PersistEncryptionBootstrapToken(
|
| - const std::string& token,
|
| - syncer::BootstrapTokenType token_type);
|
| + void PersistEncryptionBootstrapToken(const std::string& token,
|
| + syncer::BootstrapTokenType token_type);
|
|
|
| // For convenience, checks if initialization state is INITIALIZED.
|
| bool initialized() const { return initialized_; }
|
| @@ -293,9 +289,8 @@ class SyncBackendHostImpl
|
|
|
| // Invoked when the set of encrypted types or the encrypt
|
| // everything flag changes.
|
| - void NotifyEncryptedTypesChanged(
|
| - syncer::ModelTypeSet encrypted_types,
|
| - bool encrypt_everything);
|
| + void NotifyEncryptedTypesChanged(syncer::ModelTypeSet encrypted_types,
|
| + bool encrypt_everything);
|
|
|
| // Invoked when sync finishes encrypting new datatypes.
|
| void NotifyEncryptionComplete();
|
|
|