| OLD | NEW |
| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 bool use_ssl, | 66 bool use_ssl, |
| 67 const scoped_refptr<base::TaskRunner>& blocking_task_runner, | 67 const scoped_refptr<base::TaskRunner>& blocking_task_runner, |
| 68 scoped_ptr<HttpPostProviderFactory> post_factory, | 68 scoped_ptr<HttpPostProviderFactory> post_factory, |
| 69 const std::vector<ModelSafeWorker*>& workers, | 69 const std::vector<ModelSafeWorker*>& workers, |
| 70 ExtensionsActivityMonitor* extensions_activity_monitor, | 70 ExtensionsActivityMonitor* extensions_activity_monitor, |
| 71 SyncManager::ChangeDelegate* change_delegate, | 71 SyncManager::ChangeDelegate* change_delegate, |
| 72 const SyncCredentials& credentials, | 72 const SyncCredentials& credentials, |
| 73 scoped_ptr<SyncNotifier> sync_notifier, | 73 scoped_ptr<SyncNotifier> sync_notifier, |
| 74 const std::string& restored_key_for_bootstrapping, | 74 const std::string& restored_key_for_bootstrapping, |
| 75 const std::string& restored_keystore_key_for_bootstrapping, | 75 const std::string& restored_keystore_key_for_bootstrapping, |
| 76 bool keystore_encryption_enabled, | |
| 77 scoped_ptr<InternalComponentsFactory> internal_components_factory, | 76 scoped_ptr<InternalComponentsFactory> internal_components_factory, |
| 78 Encryptor* encryptor, | 77 Encryptor* encryptor, |
| 79 UnrecoverableErrorHandler* unrecoverable_error_handler, | 78 UnrecoverableErrorHandler* unrecoverable_error_handler, |
| 80 ReportUnrecoverableErrorFunction | 79 ReportUnrecoverableErrorFunction |
| 81 report_unrecoverable_error_function) OVERRIDE; | 80 report_unrecoverable_error_function) OVERRIDE; |
| 82 virtual void ThrowUnrecoverableError() OVERRIDE; | 81 virtual void ThrowUnrecoverableError() OVERRIDE; |
| 83 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE; | 82 virtual ModelTypeSet InitialSyncEndedTypes() OVERRIDE; |
| 84 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken( | 83 virtual ModelTypeSet GetTypesWithEmptyProgressMarkerToken( |
| 85 ModelTypeSet types) OVERRIDE; | 84 ModelTypeSet types) OVERRIDE; |
| 86 virtual bool PurgePartiallySyncedTypes() OVERRIDE; | 85 virtual bool PurgePartiallySyncedTypes() OVERRIDE; |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 // conflict resolver) updated the nigori's encryption keys in this chrome | 418 // conflict resolver) updated the nigori's encryption keys in this chrome |
| 420 // instantiation. | 419 // instantiation. |
| 421 int nigori_overwrite_count_; | 420 int nigori_overwrite_count_; |
| 422 | 421 |
| 423 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl); | 422 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl); |
| 424 }; | 423 }; |
| 425 | 424 |
| 426 } // namespace syncer | 425 } // namespace syncer |
| 427 | 426 |
| 428 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ | 427 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ |
| OLD | NEW |