Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / sync / internal_api / sync_encryption_handler_impl.h

diff --git a/src/sync/internal_api/sync_encryption_handler_impl.h b/src/sync/internal_api/sync_encryption_handler_impl.h
index 89621c7..2db4c47 100644 (file)
--- a/src/sync/internal_api/sync_encryption_handler_impl.h
+++ b/src/sync/internal_api/sync_encryption_handler_impl.h
@@ -51,35 +51,33 @@ class SYNC_EXPORT_PRIVATE SyncEncryptionHandlerImpl
       Encryptor* encryptor,
       const std::string& restored_key_for_bootstrapping,
       const std::string& restored_keystore_key_for_bootstrapping);
-  virtual ~SyncEncryptionHandlerImpl();
+  ~SyncEncryptionHandlerImpl() override;
 
   // SyncEncryptionHandler implementation.
-  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;
-  virtual void SetDecryptionPassphrase(const std::string& passphrase) OVERRIDE;
-  virtual void EnableEncryptEverything() OVERRIDE;
-  virtual bool EncryptEverythingEnabled() const OVERRIDE;
-  virtual PassphraseType GetPassphraseType() const OVERRIDE;
+  void AddObserver(Observer* observer) override;
+  void RemoveObserver(Observer* observer) override;
+  void Init() override;
+  void SetEncryptionPassphrase(const std::string& passphrase,
+                               bool is_explicit) override;
+  void SetDecryptionPassphrase(const std::string& passphrase) override;
+  void EnableEncryptEverything() override;
+  bool EncryptEverythingEnabled() const override;
+  PassphraseType GetPassphraseType() const override;
 
   // NigoriHandler implementation.
   // Note: all methods are invoked while the caller holds a transaction.
-  virtual void ApplyNigoriUpdate(
-      const sync_pb::NigoriSpecifics& nigori,
-      syncable::BaseTransaction* const trans) OVERRIDE;
-  virtual void UpdateNigoriFromEncryptedTypes(
+  void ApplyNigoriUpdate(const sync_pb::NigoriSpecifics& nigori,
+                         syncable::BaseTransaction* const trans) override;
+  void UpdateNigoriFromEncryptedTypes(
       sync_pb::NigoriSpecifics* nigori,
-      syncable::BaseTransaction* const trans) const OVERRIDE;
-  virtual bool NeedKeystoreKey(
-      syncable::BaseTransaction* const trans) const OVERRIDE;
-  virtual bool SetKeystoreKeys(
+      syncable::BaseTransaction* const trans) const override;
+  bool NeedKeystoreKey(syncable::BaseTransaction* const trans) const override;
+  bool SetKeystoreKeys(
       const google::protobuf::RepeatedPtrField<google::protobuf::string>& keys,
-      syncable::BaseTransaction* const trans) OVERRIDE;
+      syncable::BaseTransaction* const trans) override;
   // Can be called from any thread.
-  virtual ModelTypeSet GetEncryptedTypes(
-      syncable::BaseTransaction* const trans) const OVERRIDE;
+  ModelTypeSet GetEncryptedTypes(
+      syncable::BaseTransaction* const trans) const override;
 
   // Unsafe getters. Use only if sync is not up and running and there is no risk
   // of other threads calling this.