| 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 edae8011e255ef1d6042067a84449483f520da58..d741848c9e89766fbb361632a334c8acece20bb8 100644
|
| --- a/content/browser/dom_storage/session_storage_namespace_impl.h
|
| +++ b/content/browser/dom_storage/session_storage_namespace_impl.h
|
| @@ -10,12 +10,10 @@
|
| #include "content/common/content_export.h"
|
| #include "content/public/browser/session_storage_namespace.h"
|
|
|
| -namespace dom_storage {
|
| -class DomStorageSession;
|
| -}
|
| -
|
| namespace content {
|
| -class DOMStorageContextImpl;
|
| +
|
| +class DOMStorageContextWrapper;
|
| +class DOMStorageSession;
|
|
|
| class SessionStorageNamespaceImpl
|
| : NON_EXPORTED_BASE(public SessionStorageNamespace) {
|
| @@ -24,16 +22,16 @@ class SessionStorageNamespaceImpl
|
| //
|
| // The CONTENT_EXPORT allows TestRenderViewHost to instantiate these.
|
| CONTENT_EXPORT explicit SessionStorageNamespaceImpl(
|
| - DOMStorageContextImpl* context);
|
| + DOMStorageContextWrapper* context);
|
|
|
| // Constructs a |SessionStorageNamespaceImpl| by cloning
|
| // |namespace_to_clone|. Allocates new IDs for it.
|
| - SessionStorageNamespaceImpl(DOMStorageContextImpl* context,
|
| + SessionStorageNamespaceImpl(DOMStorageContextWrapper* context,
|
| int64 namepace_id_to_clone);
|
|
|
| // Constructs a |SessionStorageNamespaceImpl| and assigns |persistent_id|
|
| // to it. Allocates a new non-persistent ID.
|
| - SessionStorageNamespaceImpl(DOMStorageContextImpl* context,
|
| + SessionStorageNamespaceImpl(DOMStorageContextWrapper* context,
|
| const std::string& persistent_id);
|
|
|
| // SessionStorageNamespace implementation.
|
| @@ -43,13 +41,13 @@ class SessionStorageNamespaceImpl
|
| virtual bool should_persist() const OVERRIDE;
|
|
|
| SessionStorageNamespaceImpl* Clone();
|
| - bool IsFromContext(DOMStorageContextImpl* context);
|
| + bool IsFromContext(DOMStorageContextWrapper* context);
|
|
|
| private:
|
| - explicit SessionStorageNamespaceImpl(dom_storage::DomStorageSession* clone);
|
| + explicit SessionStorageNamespaceImpl(DOMStorageSession* clone);
|
| virtual ~SessionStorageNamespaceImpl();
|
|
|
| - scoped_refptr<dom_storage::DomStorageSession> session_;
|
| + scoped_refptr<DOMStorageSession> session_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SessionStorageNamespaceImpl);
|
| };
|
|
|