| 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 CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 6 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 void OnPassphraseRequired( | 412 void OnPassphraseRequired( |
| 413 syncer::PassphraseRequiredReason reason, | 413 syncer::PassphraseRequiredReason reason, |
| 414 const sync_pb::EncryptedData& pending_keys) override; | 414 const sync_pb::EncryptedData& pending_keys) override; |
| 415 void OnPassphraseAccepted() override; | 415 void OnPassphraseAccepted() override; |
| 416 void OnEncryptedTypesChanged(syncer::ModelTypeSet encrypted_types, | 416 void OnEncryptedTypesChanged(syncer::ModelTypeSet encrypted_types, |
| 417 bool encrypt_everything) override; | 417 bool encrypt_everything) override; |
| 418 void OnEncryptionComplete() override; | 418 void OnEncryptionComplete() override; |
| 419 void OnMigrationNeededForTypes(syncer::ModelTypeSet types) override; | 419 void OnMigrationNeededForTypes(syncer::ModelTypeSet types) override; |
| 420 void OnExperimentsChanged(const syncer::Experiments& experiments) override; | 420 void OnExperimentsChanged(const syncer::Experiments& experiments) override; |
| 421 void OnActionableError(const syncer::SyncProtocolError& error) override; | 421 void OnActionableError(const syncer::SyncProtocolError& error) override; |
| 422 void OnLocalSetCustomPassphrase( |
| 423 const syncer::SyncEncryptionHandler::NigoriState& nigori_state) override; |
| 422 | 424 |
| 423 // DataTypeManagerObserver implementation. | 425 // DataTypeManagerObserver implementation. |
| 424 void OnConfigureDone( | 426 void OnConfigureDone( |
| 425 const sync_driver::DataTypeManager::ConfigureResult& result) override; | 427 const sync_driver::DataTypeManager::ConfigureResult& result) override; |
| 426 void OnConfigureStart() override; | 428 void OnConfigureStart() override; |
| 427 | 429 |
| 428 // DataTypeEncryptionHandler implementation. | 430 // DataTypeEncryptionHandler implementation. |
| 429 bool IsPassphraseRequired() const override; | 431 bool IsPassphraseRequired() const override; |
| 430 syncer::ModelTypeSet GetEncryptedDataTypes() const override; | 432 syncer::ModelTypeSet GetEncryptedDataTypes() const override; |
| 431 | 433 |
| (...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1097 base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_; | 1099 base::WeakPtrFactory<ProfileSyncService> startup_controller_weak_factory_; |
| 1098 | 1100 |
| 1099 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); | 1101 DISALLOW_COPY_AND_ASSIGN(ProfileSyncService); |
| 1100 }; | 1102 }; |
| 1101 | 1103 |
| 1102 bool ShouldShowActionOnUI( | 1104 bool ShouldShowActionOnUI( |
| 1103 const syncer::SyncProtocolError& error); | 1105 const syncer::SyncProtocolError& error); |
| 1104 | 1106 |
| 1105 | 1107 |
| 1106 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ | 1108 #endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |
| OLD | NEW |