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

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

Issue 10455012: [Sync] Add support for performing a GetKey on startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fred's comments Created 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 int sync_server_port, 64 int sync_server_port,
65 bool use_ssl, 65 bool use_ssl,
66 const scoped_refptr<base::TaskRunner>& blocking_task_runner, 66 const scoped_refptr<base::TaskRunner>& blocking_task_runner,
67 scoped_ptr<HttpPostProviderFactory> post_factory, 67 scoped_ptr<HttpPostProviderFactory> post_factory,
68 const std::vector<ModelSafeWorker*>& workers, 68 const std::vector<ModelSafeWorker*>& workers,
69 ExtensionsActivityMonitor* extensions_activity_monitor, 69 ExtensionsActivityMonitor* extensions_activity_monitor,
70 SyncManager::ChangeDelegate* change_delegate, 70 SyncManager::ChangeDelegate* change_delegate,
71 const SyncCredentials& credentials, 71 const SyncCredentials& credentials,
72 scoped_ptr<SyncNotifier> sync_notifier, 72 scoped_ptr<SyncNotifier> sync_notifier,
73 const std::string& restored_key_for_bootstrapping, 73 const std::string& restored_key_for_bootstrapping,
74 bool keystore_encryption_enabled,
74 scoped_ptr<InternalComponentsFactory> internal_components_factory, 75 scoped_ptr<InternalComponentsFactory> internal_components_factory,
75 Encryptor* encryptor, 76 Encryptor* encryptor,
76 UnrecoverableErrorHandler* unrecoverable_error_handler, 77 UnrecoverableErrorHandler* unrecoverable_error_handler,
77 ReportUnrecoverableErrorFunction 78 ReportUnrecoverableErrorFunction
78 report_unrecoverable_error_function) OVERRIDE; 79 report_unrecoverable_error_function) OVERRIDE;
79 virtual void ThrowUnrecoverableError() OVERRIDE; 80 virtual void ThrowUnrecoverableError() OVERRIDE;
80 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE; 81 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE;
81 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken( 82 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken(
82 ModelTypeSet types) OVERRIDE; 83 ModelTypeSet types) OVERRIDE;
83 virtual bool PurgePartiallySyncedTypes() OVERRIDE; 84 virtual bool PurgePartiallySyncedTypes() OVERRIDE;
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 // conflict resolver) updated the nigori's encryption keys in this chrome 401 // conflict resolver) updated the nigori's encryption keys in this chrome
401 // instantiation. 402 // instantiation.
402 int nigori_overwrite_count_; 403 int nigori_overwrite_count_;
403 404
404 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl); 405 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl);
405 }; 406 };
406 407
407 } // namespace syncer 408 } // namespace syncer
408 409
409 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ 410 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698