| Index: content/browser/dom_storage/session_storage_namespace_impl.h
|
| diff --git a/content/browser/dom_storage/session_storage_namespace_impl.h b/content/browser/dom_storage/session_storage_namespace_impl.h
|
| index cadb23924381e34c4e196a235724fb82185ee555..025ee8729dac06372c6c933bdb4e849001ba373b 100644
|
| --- a/content/browser/dom_storage/session_storage_namespace_impl.h
|
| +++ b/content/browser/dom_storage/session_storage_namespace_impl.h
|
| @@ -40,26 +40,26 @@ class SessionStorageNamespaceImpl
|
| SessionStorageNamespaceImpl* master_session_storage_namespace);
|
|
|
| // SessionStorageNamespace implementation.
|
| - virtual int64 id() const override;
|
| - virtual const std::string& persistent_id() const override;
|
| - virtual void SetShouldPersist(bool should_persist) override;
|
| - virtual bool should_persist() const override;
|
| + int64 id() const override;
|
| + const std::string& persistent_id() const override;
|
| + void SetShouldPersist(bool should_persist) override;
|
| + bool should_persist() const override;
|
|
|
| SessionStorageNamespaceImpl* Clone();
|
| bool IsFromContext(DOMStorageContextWrapper* context);
|
|
|
| - virtual void AddTransactionLogProcessId(int process_id) override;
|
| - virtual void RemoveTransactionLogProcessId(int process_id) override;
|
| - virtual void Merge(bool actually_merge,
|
| - int process_id,
|
| - SessionStorageNamespace* other,
|
| - const MergeResultCallback& callback) override;
|
| - virtual bool IsAliasOf(SessionStorageNamespace* other) override;
|
| - virtual SessionStorageNamespace* CreateAlias() override;
|
| + void AddTransactionLogProcessId(int process_id) override;
|
| + void RemoveTransactionLogProcessId(int process_id) override;
|
| + void Merge(bool actually_merge,
|
| + int process_id,
|
| + SessionStorageNamespace* other,
|
| + const MergeResultCallback& callback) override;
|
| + bool IsAliasOf(SessionStorageNamespace* other) override;
|
| + SessionStorageNamespace* CreateAlias() override;
|
|
|
| private:
|
| explicit SessionStorageNamespaceImpl(DOMStorageSession* clone);
|
| - virtual ~SessionStorageNamespaceImpl();
|
| + ~SessionStorageNamespaceImpl() override;
|
|
|
| scoped_refptr<DOMStorageSession> session_;
|
|
|
|
|