| Index: sync/internal_api/sync_rollback_manager_base.cc
|
| diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc
|
| index dc314b00045e3b3bd87ae892214a9cb1108f9f29..2cc6d69962dfd3dc82ff4d4b5777ae7b0538fee4 100644
|
| --- a/sync/internal_api/sync_rollback_manager_base.cc
|
| +++ b/sync/internal_api/sync_rollback_manager_base.cc
|
| @@ -19,18 +19,18 @@ const char kBookmarkBarTag[] = "bookmark_bar";
|
| const char kOtherBookmarksTag[] = "other_bookmarks";
|
|
|
| class DummyEntryptionHandler : public syncer::SyncEncryptionHandler {
|
| - virtual void AddObserver(Observer* observer) OVERRIDE {}
|
| - virtual void RemoveObserver(Observer* observer) OVERRIDE {}
|
| - virtual void Init() OVERRIDE {}
|
| + virtual void AddObserver(Observer* observer) override {}
|
| + virtual void RemoveObserver(Observer* observer) override {}
|
| + virtual void Init() override {}
|
| virtual void SetEncryptionPassphrase(const std::string& passphrase,
|
| - bool is_explicit) OVERRIDE {}
|
| + bool is_explicit) override {}
|
| virtual void SetDecryptionPassphrase(const std::string& passphrase)
|
| - OVERRIDE {}
|
| - virtual void EnableEncryptEverything() OVERRIDE {}
|
| - virtual bool EncryptEverythingEnabled() const OVERRIDE {
|
| + override {}
|
| + virtual void EnableEncryptEverything() override {}
|
| + virtual bool EncryptEverythingEnabled() const override {
|
| return false;
|
| }
|
| - virtual syncer::PassphraseType GetPassphraseType() const OVERRIDE {
|
| + virtual syncer::PassphraseType GetPassphraseType() const override {
|
| return syncer::KEYSTORE_PASSPHRASE;
|
| }
|
| };
|
|
|