| Index: sync/internal_api/js_sync_encryption_handler_observer.h
|
| diff --git a/sync/internal_api/js_sync_encryption_handler_observer.h b/sync/internal_api/js_sync_encryption_handler_observer.h
|
| index 94a085e0d4177dee16f0850a2a1e9796652efd10..82d5743f04e4c5ebfc03326bf8ba5d9a77b761d2 100644
|
| --- a/sync/internal_api/js_sync_encryption_handler_observer.h
|
| +++ b/sync/internal_api/js_sync_encryption_handler_observer.h
|
| @@ -28,27 +28,23 @@ class SYNC_EXPORT_PRIVATE JsSyncEncryptionHandlerObserver
|
| : public SyncEncryptionHandler::Observer {
|
| public:
|
| JsSyncEncryptionHandlerObserver();
|
| - virtual ~JsSyncEncryptionHandlerObserver();
|
| + ~JsSyncEncryptionHandlerObserver() override;
|
|
|
| void SetJsEventHandler(const WeakHandle<JsEventHandler>& event_handler);
|
|
|
| // SyncEncryptionHandlerObserver::Observer implementation.
|
| - virtual void OnPassphraseRequired(
|
| + void OnPassphraseRequired(
|
| PassphraseRequiredReason reason,
|
| const sync_pb::EncryptedData& pending_keys) override;
|
| - virtual void OnPassphraseAccepted() override;
|
| - virtual void OnBootstrapTokenUpdated(
|
| - const std::string& bootstrap_token,
|
| - BootstrapTokenType type) override;
|
| - virtual void OnEncryptedTypesChanged(
|
| - ModelTypeSet encrypted_types,
|
| - bool encrypt_everything) override;
|
| - virtual void OnEncryptionComplete() override;
|
| - virtual void OnCryptographerStateChanged(
|
| - Cryptographer* cryptographer) override;
|
| - virtual void OnPassphraseTypeChanged(
|
| - PassphraseType type,
|
| - base::Time explicit_passphrase_time) override;
|
| + void OnPassphraseAccepted() override;
|
| + void OnBootstrapTokenUpdated(const std::string& bootstrap_token,
|
| + BootstrapTokenType type) override;
|
| + void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
|
| + bool encrypt_everything) override;
|
| + void OnEncryptionComplete() override;
|
| + void OnCryptographerStateChanged(Cryptographer* cryptographer) override;
|
| + void OnPassphraseTypeChanged(PassphraseType type,
|
| + base::Time explicit_passphrase_time) override;
|
|
|
| private:
|
| void HandleJsEvent(const tracked_objects::Location& from_here,
|
|
|