| Index: components/sync/core_impl/sync_manager_impl.h
|
| diff --git a/sync/internal_api/sync_manager_impl.h b/components/sync/core_impl/sync_manager_impl.h
|
| similarity index 89%
|
| rename from sync/internal_api/sync_manager_impl.h
|
| rename to components/sync/core_impl/sync_manager_impl.h
|
| index c9b0683dbae28d6f747ae7699068e41fd72c2b78..6c584a674d937de80a07a64c465f5eea2f308a49 100644
|
| --- a/sync/internal_api/sync_manager_impl.h
|
| +++ b/components/sync/core_impl/sync_manager_impl.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_INTERNAL_API_SYNC_MANAGER_IMPL_H_
|
| -#define SYNC_INTERNAL_API_SYNC_MANAGER_IMPL_H_
|
| +#ifndef COMPONENTS_SYNC_CORE_IMPL_SYNC_MANAGER_IMPL_H_
|
| +#define COMPONENTS_SYNC_CORE_IMPL_SYNC_MANAGER_IMPL_H_
|
|
|
| #include <stdint.h>
|
|
|
| @@ -13,25 +13,25 @@
|
|
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| +#include "components/sync/base/cryptographer.h"
|
| +#include "components/sync/base/sync_export.h"
|
| +#include "components/sync/base/time.h"
|
| +#include "components/sync/core/sync_manager.h"
|
| +#include "components/sync/core/user_share.h"
|
| +#include "components/sync/core_impl/change_reorder_buffer.h"
|
| +#include "components/sync/core_impl/debug_info_event_listener.h"
|
| +#include "components/sync/core_impl/js_mutation_event_observer.h"
|
| +#include "components/sync/core_impl/js_sync_encryption_handler_observer.h"
|
| +#include "components/sync/core_impl/js_sync_manager_observer.h"
|
| +#include "components/sync/core_impl/protocol_event_buffer.h"
|
| +#include "components/sync/core_impl/sync_encryption_handler_impl.h"
|
| +#include "components/sync/engine_impl/all_status.h"
|
| +#include "components/sync/engine_impl/net/server_connection_manager.h"
|
| +#include "components/sync/engine_impl/nudge_handler.h"
|
| +#include "components/sync/engine_impl/sync_engine_event_listener.h"
|
| +#include "components/sync/js/js_backend.h"
|
| +#include "components/sync/syncable/directory_change_delegate.h"
|
| #include "net/base/network_change_notifier.h"
|
| -#include "sync/base/sync_export.h"
|
| -#include "sync/engine/all_status.h"
|
| -#include "sync/engine/net/server_connection_manager.h"
|
| -#include "sync/engine/nudge_handler.h"
|
| -#include "sync/engine/sync_engine_event_listener.h"
|
| -#include "sync/internal_api/change_reorder_buffer.h"
|
| -#include "sync/internal_api/debug_info_event_listener.h"
|
| -#include "sync/internal_api/js_mutation_event_observer.h"
|
| -#include "sync/internal_api/js_sync_encryption_handler_observer.h"
|
| -#include "sync/internal_api/js_sync_manager_observer.h"
|
| -#include "sync/internal_api/protocol_event_buffer.h"
|
| -#include "sync/internal_api/public/sync_manager.h"
|
| -#include "sync/internal_api/public/user_share.h"
|
| -#include "sync/internal_api/sync_encryption_handler_impl.h"
|
| -#include "sync/js/js_backend.h"
|
| -#include "sync/syncable/directory_change_delegate.h"
|
| -#include "sync/util/cryptographer.h"
|
| -#include "sync/util/time.h"
|
|
|
| class GURL;
|
|
|
| @@ -221,9 +221,8 @@ class SYNC_EXPORT SyncManagerImpl
|
| // Determine if any of the fields made visible to clients of the Sync API
|
| // differ between the versions of an entry stored in |a| and |b|. A return
|
| // value of false means that it should be OK to ignore this change.
|
| - bool VisiblePropertiesDiffer(
|
| - const syncable::EntryKernelMutation& mutation,
|
| - Cryptographer* cryptographer) const;
|
| + bool VisiblePropertiesDiffer(const syncable::EntryKernelMutation& mutation,
|
| + Cryptographer* cryptographer) const;
|
|
|
| // Open the directory named with |username|.
|
| bool OpenDirectory(const std::string& username);
|
| @@ -236,9 +235,8 @@ class SYNC_EXPORT SyncManagerImpl
|
| ModelTypeSet to_journal,
|
| ModelTypeSet to_unapply);
|
|
|
| - void RequestNudgeForDataTypes(
|
| - const tracked_objects::Location& nudge_location,
|
| - ModelTypeSet type);
|
| + void RequestNudgeForDataTypes(const tracked_objects::Location& nudge_location,
|
| + ModelTypeSet type);
|
|
|
| // If this is a deletion for a password, sets the legacy
|
| // ExtraPasswordChangeRecordData field of |buffer|. Otherwise sets
|
| @@ -347,4 +345,4 @@ class SYNC_EXPORT SyncManagerImpl
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_INTERNAL_API_SYNC_MANAGER_IMPL_H_
|
| +#endif // COMPONENTS_SYNC_CORE_IMPL_SYNC_MANAGER_IMPL_H_
|
|
|