Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5195)

Unified Diff: content/browser/dom_storage/session_storage_namespace_impl.h

Issue 757723002: [Tests not passing yet] Remove prerender sessionStorage namespace merging. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 025ee8729dac06372c6c933bdb4e849001ba373b..83a9866241ef63b310993dbb5ae6c7a4d44e0318 100644
--- a/content/browser/dom_storage/session_storage_namespace_impl.h
+++ b/content/browser/dom_storage/session_storage_namespace_impl.h
@@ -34,11 +34,6 @@ class SessionStorageNamespaceImpl
SessionStorageNamespaceImpl(DOMStorageContextWrapper* context,
const std::string& persistent_id);
- // Creates an alias of |master_session_storage_namespace|. This will allocate
- // a new non-persistent ID.
- explicit SessionStorageNamespaceImpl(
- SessionStorageNamespaceImpl* master_session_storage_namespace);
-
// SessionStorageNamespace implementation.
int64 id() const override;
const std::string& persistent_id() const override;
@@ -48,15 +43,6 @@ class SessionStorageNamespaceImpl
SessionStorageNamespaceImpl* Clone();
bool IsFromContext(DOMStorageContextWrapper* context);
- 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);
~SessionStorageNamespaceImpl() override;
« no previous file with comments | « content/browser/dom_storage/dom_storage_session.cc ('k') | content/browser/dom_storage/session_storage_namespace_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698