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

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

Issue 12847003: Separate invalidator and sync client ID (part 2/2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix sync_listen_notifications utility Created 7 years, 9 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 const WeakHandle<JsEventHandler>& event_handler, 68 const WeakHandle<JsEventHandler>& event_handler,
69 const std::string& sync_server_and_path, 69 const std::string& sync_server_and_path,
70 int sync_server_port, 70 int sync_server_port,
71 bool use_ssl, 71 bool use_ssl,
72 scoped_ptr<HttpPostProviderFactory> post_factory, 72 scoped_ptr<HttpPostProviderFactory> post_factory,
73 const std::vector<ModelSafeWorker*>& workers, 73 const std::vector<ModelSafeWorker*>& workers,
74 ExtensionsActivityMonitor* extensions_activity_monitor, 74 ExtensionsActivityMonitor* extensions_activity_monitor,
75 SyncManager::ChangeDelegate* change_delegate, 75 SyncManager::ChangeDelegate* change_delegate,
76 const SyncCredentials& credentials, 76 const SyncCredentials& credentials,
77 scoped_ptr<Invalidator> invalidator, 77 scoped_ptr<Invalidator> invalidator,
78 const std::string& invalidator_client_id,
78 const std::string& restored_key_for_bootstrapping, 79 const std::string& restored_key_for_bootstrapping,
79 const std::string& restored_keystore_key_for_bootstrapping, 80 const std::string& restored_keystore_key_for_bootstrapping,
80 scoped_ptr<InternalComponentsFactory> internal_components_factory, 81 scoped_ptr<InternalComponentsFactory> internal_components_factory,
81 Encryptor* encryptor, 82 Encryptor* encryptor,
82 UnrecoverableErrorHandler* unrecoverable_error_handler, 83 UnrecoverableErrorHandler* unrecoverable_error_handler,
83 ReportUnrecoverableErrorFunction 84 ReportUnrecoverableErrorFunction
84 report_unrecoverable_error_function) OVERRIDE; 85 report_unrecoverable_error_function) OVERRIDE;
85 virtual void ThrowUnrecoverableError() OVERRIDE; 86 virtual void ThrowUnrecoverableError() OVERRIDE;
86 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE; 87 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
87 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken( 88 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 // changing passphrases, and in general handles sync-specific interactions 382 // changing passphrases, and in general handles sync-specific interactions
382 // with the cryptographer. 383 // with the cryptographer.
383 scoped_ptr<SyncEncryptionHandlerImpl> sync_encryption_handler_; 384 scoped_ptr<SyncEncryptionHandlerImpl> sync_encryption_handler_;
384 385
385 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl); 386 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl);
386 }; 387 };
387 388
388 } // namespace syncer 389 } // namespace syncer
389 390
390 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ 391 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_
OLDNEW
« no previous file with comments | « sync/internal_api/public/test/fake_sync_manager.h ('k') | sync/internal_api/sync_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698