Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(635)

Unified Diff: components/sync/core/sync_manager.h

Issue 2130453004: [Sync] Move //sync to //components/sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/core/sync_encryption_handler.cc ('k') | components/sync/core/sync_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/core/sync_manager.h
diff --git a/sync/internal_api/public/sync_manager.h b/components/sync/core/sync_manager.h
similarity index 89%
rename from sync/internal_api/public/sync_manager.h
rename to components/sync/core/sync_manager.h
index 1e9cb34b2a4bdeda4f5e0f8305eb690cab2603e1..e5c1e36a9395b59b3aaa5da4d1c2be5e33f062ed 100644
--- a/sync/internal_api/public/sync_manager.h
+++ b/components/sync/core/sync_manager.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_PUBLIC_SYNC_MANAGER_H_
-#define SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_
+#ifndef COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
+#define COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
#include <stdint.h>
@@ -17,23 +17,23 @@
#include "base/memory/scoped_vector.h"
#include "base/task_runner.h"
#include "base/threading/thread_checker.h"
+#include "components/sync/base/invalidation_interface.h"
+#include "components/sync/base/model_type.h"
+#include "components/sync/base/sync_export.h"
+#include "components/sync/base/weak_handle.h"
+#include "components/sync/core/change_record.h"
+#include "components/sync/core/configure_reason.h"
+#include "components/sync/core/connection_status.h"
+#include "components/sync/core/http_post_provider_factory.h"
+#include "components/sync/core/internal_components_factory.h"
+#include "components/sync/core/model_type_connector.h"
+#include "components/sync/core/shutdown_reason.h"
+#include "components/sync/core/sync_encryption_handler.h"
+#include "components/sync/engine/events/protocol_event.h"
+#include "components/sync/engine/model_safe_worker.h"
+#include "components/sync/engine/sync_status.h"
+#include "components/sync/protocol/sync_protocol_error.h"
#include "google_apis/gaia/oauth2_token_service.h"
-#include "sync/base/sync_export.h"
-#include "sync/internal_api/public/base/invalidation_interface.h"
-#include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/change_record.h"
-#include "sync/internal_api/public/configure_reason.h"
-#include "sync/internal_api/public/connection_status.h"
-#include "sync/internal_api/public/engine/model_safe_worker.h"
-#include "sync/internal_api/public/engine/sync_status.h"
-#include "sync/internal_api/public/events/protocol_event.h"
-#include "sync/internal_api/public/http_post_provider_factory.h"
-#include "sync/internal_api/public/internal_components_factory.h"
-#include "sync/internal_api/public/model_type_connector.h"
-#include "sync/internal_api/public/shutdown_reason.h"
-#include "sync/internal_api/public/sync_encryption_handler.h"
-#include "sync/internal_api/public/util/weak_handle.h"
-#include "sync/protocol/sync_protocol_error.h"
class GURL;
@@ -233,7 +233,7 @@ class SYNC_EXPORT SyncManager {
// Used to communicate with the sync server.
std::unique_ptr<HttpPostProviderFactory> post_factory;
- std::vector<scoped_refptr<ModelSafeWorker> > workers;
+ std::vector<scoped_refptr<ModelSafeWorker>> workers;
// Must outlive SyncManager.
ExtensionsActivity* extensions_activity;
@@ -296,9 +296,8 @@ class SYNC_EXPORT SyncManager {
virtual void UpdateCredentials(const SyncCredentials& credentials) = 0;
// Put the syncer in normal mode ready to perform nudges and polls.
- virtual void StartSyncingNormally(
- const ModelSafeRoutingInfo& routing_info,
- base::Time last_poll_time) = 0;
+ virtual void StartSyncingNormally(const ModelSafeRoutingInfo& routing_info,
+ base::Time last_poll_time) = 0;
// Switches the mode of operation to CONFIGURATION_MODE and performs
// any configuration tasks needed as determined by the params. Once complete,
@@ -313,15 +312,14 @@ class SYNC_EXPORT SyncManager {
// |retry_task| is invoked if the configuration job could not immediately
// execute. |ready_task| will still be called when it eventually
// does finish.
- virtual void ConfigureSyncer(
- ConfigureReason reason,
- ModelTypeSet to_download,
- ModelTypeSet to_purge,
- ModelTypeSet to_journal,
- ModelTypeSet to_unapply,
- const ModelSafeRoutingInfo& new_routing_info,
- const base::Closure& ready_task,
- const base::Closure& retry_task) = 0;
+ virtual void ConfigureSyncer(ConfigureReason reason,
+ ModelTypeSet to_download,
+ ModelTypeSet to_purge,
+ ModelTypeSet to_journal,
+ ModelTypeSet to_unapply,
+ const ModelSafeRoutingInfo& new_routing_info,
+ const base::Closure& ready_task,
+ const base::Closure& retry_task) = 0;
// Inform the syncer of a change in the invalidator's state.
virtual void SetInvalidatorEnabled(bool invalidator_enabled) = 0;
@@ -410,4 +408,4 @@ class SYNC_EXPORT SyncManager {
} // namespace syncer
-#endif // SYNC_INTERNAL_API_PUBLIC_SYNC_MANAGER_H_
+#endif // COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
« no previous file with comments | « components/sync/core/sync_encryption_handler.cc ('k') | components/sync/core/sync_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698