Adding session-only localStorage.

content/browser/in_process_webkit/dom_storage_namespace.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_NAMESPACE_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_NAMESPACE_H_
 #pragma once
 
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "content/common/dom_storage_common.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 
 class DOMStorageArea;
 class DOMStorageContext;
 class FilePath;
 
+namespace IPC {
+class Message;
+}
+
 namespace WebKit {
 class WebStorageArea;
 class WebStorageNamespace;
 }
 
 // Only to be used on the WebKit thread.
 class DOMStorageNamespace {
  public:
+  class Delegate {

[jochen (gone - plz use gerrit), 2011/07/29 08:01:06]

instead of using this delegate, you should use base/callback.h

[marja, 2011/08/01 08:36:32]

Done.

(This will change again, though, after I've done the modifications michaeln
suggested.)

+   public:
+    virtual void OnGotStorageArea(DOMStorageArea* storage_area,
+                                  IPC::Message* reply_msg) = 0;
+  };
+
   static DOMStorageNamespace* CreateLocalStorageNamespace(
       DOMStorageContext* dom_storage_context, const FilePath& data_dir_path);
   static DOMStorageNamespace* CreateSessionStorageNamespace(
       DOMStorageContext* dom_storage_context, int64 namespace_id);
 
   ~DOMStorageNamespace();
 
-  DOMStorageArea* GetStorageArea(const string16& origin);
+  DOMStorageArea* GetStorageArea(const string16& origin,
+                                 DOMStorageNamespace::Delegate* delegate,
+                                 IPC::Message* reply_msg);
+
   DOMStorageNamespace* Copy(int64 clone_namespace_id);
 
   void PurgeMemory();
 
   const DOMStorageContext* dom_storage_context() const {
     return dom_storage_context_;
   }
   int64 id() const { return id_; }
   const WebKit::WebString& data_dir_path() const { return data_dir_path_; }
   DOMStorageType dom_storage_type() const { return dom_storage_type_; }
 
   // Creates a WebStorageArea for the given origin.  This should only be called
   // by an owned DOMStorageArea.
   WebKit::WebStorageArea* CreateWebStorageArea(const string16& origin);
 
+  // Helpers for creating DOMStorageAreas.
+  DOMStorageArea* GetExistingStorageArea(const string16& origin);
+  DOMStorageArea* CreateStorageAreaInWebKitThread(const string16& origin,
+                                                  bool allow_permanent_storage,
+                                                  Delegate* delegate,
+                                                  IPC::Message* reply_msg);
  private:
   // Called by the static factory methods above.
   DOMStorageNamespace(DOMStorageContext* dom_storage_context,
                       int64 id,
                       const WebKit::WebString& data_dir_path,
                       DOMStorageType storage_type);
 
   // Creates the underlying WebStorageNamespace on demand.
   void CreateWebStorageNamespaceIfNecessary();
 
@@ skipping 10 matching lines @@
   // Our id.  Unique to our parent WebKitContext class.
   int64 id_;
 
   // The path used to create us, so we can recreate our WebStorageNamespace on
   // demand.
   WebKit::WebString data_dir_path_;
 
   // SessionStorage vs. LocalStorage.
   const DOMStorageType dom_storage_type_;
 
+  // A LocalStorage namespace holds a pointer to a session-only LocalStorage
+  // namespace. NULL if this DOMStorageNamespace is a SessionStorage, or a
+  // session-only LocalStorage, or a LocalStorage associated with an off the
+  // record profile.
+  scoped_ptr<DOMStorageNamespace> session_only_local_storage_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageNamespace);
 };
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_NAMESPACE_H_