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

Side by Side Diff: sync/internal_api/sync_manager_impl.h

Issue 442403003: Update SyncManager::Init to use a GURL for the sync server URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix sync_client.cc too. Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_ 5 #ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_
6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_ 6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 11 matching lines...) Expand all
22 #include "sync/internal_api/protocol_event_buffer.h" 22 #include "sync/internal_api/protocol_event_buffer.h"
23 #include "sync/internal_api/public/sync_context_proxy.h" 23 #include "sync/internal_api/public/sync_context_proxy.h"
24 #include "sync/internal_api/public/sync_manager.h" 24 #include "sync/internal_api/public/sync_manager.h"
25 #include "sync/internal_api/public/user_share.h" 25 #include "sync/internal_api/public/user_share.h"
26 #include "sync/internal_api/sync_encryption_handler_impl.h" 26 #include "sync/internal_api/sync_encryption_handler_impl.h"
27 #include "sync/js/js_backend.h" 27 #include "sync/js/js_backend.h"
28 #include "sync/syncable/directory_change_delegate.h" 28 #include "sync/syncable/directory_change_delegate.h"
29 #include "sync/util/cryptographer.h" 29 #include "sync/util/cryptographer.h"
30 #include "sync/util/time.h" 30 #include "sync/util/time.h"
31 31
32 class GURL;
33
32 namespace syncer { 34 namespace syncer {
33 35
34 class ModelTypeRegistry; 36 class ModelTypeRegistry;
35 class SyncAPIServerConnectionManager; 37 class SyncAPIServerConnectionManager;
36 class SyncContext; 38 class SyncContext;
37 class TypeDebugInfoObserver; 39 class TypeDebugInfoObserver;
38 class WriteNode; 40 class WriteNode;
39 class WriteTransaction; 41 class WriteTransaction;
40 42
41 namespace sessions { 43 namespace sessions {
(...skipping 20 matching lines...) Expand all
62 public NudgeHandler { 64 public NudgeHandler {
63 public: 65 public:
64 // Create an uninitialized SyncManager. Callers must Init() before using. 66 // Create an uninitialized SyncManager. Callers must Init() before using.
65 explicit SyncManagerImpl(const std::string& name); 67 explicit SyncManagerImpl(const std::string& name);
66 virtual ~SyncManagerImpl(); 68 virtual ~SyncManagerImpl();
67 69
68 // SyncManager implementation. 70 // SyncManager implementation.
69 virtual void Init( 71 virtual void Init(
70 const base::FilePath& database_location, 72 const base::FilePath& database_location,
71 const WeakHandle<JsEventHandler>& event_handler, 73 const WeakHandle<JsEventHandler>& event_handler,
72 const std::string& sync_server_and_path, 74 const GURL& service_url,
73 int sync_server_port,
74 bool use_ssl,
75 scoped_ptr<HttpPostProviderFactory> post_factory, 75 scoped_ptr<HttpPostProviderFactory> post_factory,
76 const std::vector<scoped_refptr<ModelSafeWorker> >& workers, 76 const std::vector<scoped_refptr<ModelSafeWorker> >& workers,
77 ExtensionsActivity* extensions_activity, 77 ExtensionsActivity* extensions_activity,
78 SyncManager::ChangeDelegate* change_delegate, 78 SyncManager::ChangeDelegate* change_delegate,
79 const SyncCredentials& credentials, 79 const SyncCredentials& credentials,
80 const std::string& invalidator_client_id, 80 const std::string& invalidator_client_id,
81 const std::string& restored_key_for_bootstrapping, 81 const std::string& restored_key_for_bootstrapping,
82 const std::string& restored_keystore_key_for_bootstrapping, 82 const std::string& restored_keystore_key_for_bootstrapping,
83 InternalComponentsFactory* internal_components_factory, 83 InternalComponentsFactory* internal_components_factory,
84 Encryptor* encryptor, 84 Encryptor* encryptor,
85 scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler, 85 scoped_ptr<UnrecoverableErrorHandler> unrecoverable_error_handler,
86 ReportUnrecoverableErrorFunction 86 ReportUnrecoverableErrorFunction report_unrecoverable_error_function,
87 report_unrecoverable_error_function,
88 CancelationSignal* cancelation_signal) OVERRIDE; 87 CancelationSignal* cancelation_signal) OVERRIDE;
89 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE; 88 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
90 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken( 89 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
91 ModelTypeSet types) OVERRIDE; 90 ModelTypeSet types) OVERRIDE;
92 virtual bool PurgePartiallySyncedTypes() OVERRIDE; 91 virtual bool PurgePartiallySyncedTypes() OVERRIDE;
93 virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE; 92 virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE;
94 virtual void StartSyncingNormally( 93 virtual void StartSyncingNormally(
95 const ModelSafeRoutingInfo& routing_info) OVERRIDE; 94 const ModelSafeRoutingInfo& routing_info) OVERRIDE;
96 virtual void ConfigureSyncer( 95 virtual void ConfigureSyncer(
97 ConfigureReason reason, 96 ConfigureReason reason,
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 scoped_ptr<SyncEncryptionHandlerImpl> sync_encryption_handler_; 364 scoped_ptr<SyncEncryptionHandlerImpl> sync_encryption_handler_;
366 365
367 base::WeakPtrFactory<SyncManagerImpl> weak_ptr_factory_; 366 base::WeakPtrFactory<SyncManagerImpl> weak_ptr_factory_;
368 367
369 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl); 368 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl);
370 }; 369 };
371 370
372 } // namespace syncer 371 } // namespace syncer
373 372
374 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ 373 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698