Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

content/public/browser/web_contents.h

 // Copyright (c) 2012 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_PUBLIC_BROWSER_WEB_CONTENTS_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/save_page_type.h"
 #include "content/public/browser/web_ui.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/native_widget_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace base {
 class PropertyBag;
 class TimeTicks;
 }
 
 namespace gfx {
 class Rect;
 class Size;
 }
 
 namespace net {
 struct LoadStateWithParam;
 }
 
 namespace content {
 
 class BrowserContext;
 class InterstitialPage;
-class NavigationController;
 class RenderProcessHost;
 class RenderViewHost;
 class RenderWidgetHostView;
-class SessionStorageNamespace;
 class SiteInstance;
 class WebContentsDelegate;
 class WebContentsView;
 struct RendererPreferences;
 
 // Describes what goes in the main content area of a tab.
 class WebContents : public PageNavigator {
  public:
   // |base_web_contents| is used if we want to size the new WebContents's view
   // based on the view of an existing WebContents.  This can be NULL if not
   // needed.
-  //
-  // The session storage namespace parameter allows multiple render views and
-  // web contentses to share the same session storage (part of the WebStorage
-  // spec) space. This is useful when restoring tabs, but most callers should
-  // pass in NULL which will cause a new SessionStorageNamespace to be created.
   CONTENT_EXPORT static WebContents* Create(
       BrowserContext* browser_context,
       SiteInstance* site_instance,
       int routing_id,
+      const WebContents* base_web_contents);
+
+  CONTENT_EXPORT static WebContents* CreateWithSessionStorage(

[Charlie Reis, 2012/08/02 23:06:47]

Please add a comment saying when callers should use this version rather than the
default.

[awong, 2012/08/03 00:31:04]

Done.

+      BrowserContext* browser_context,
+      SiteInstance* site_instance,
+      int routing_id,
       const WebContents* base_web_contents,
-      SessionStorageNamespace* session_storage_namespace);
+      const SessionStorageNamespaceMap& session_storage_namespace_map);
 
   // Returns a WebContents that wraps the RenderViewHost, or NULL if the
   // render view host's delegate isn't a WebContents.
   CONTENT_EXPORT static WebContents* FromRenderViewHost(
       const RenderViewHost* rvh);
 
   virtual ~WebContents() {}
 
   // Intrinsic tab state -------------------------------------------------------
 
@@ skipping 303 matching lines @@
   // Focuses the location bar.
   virtual void SetFocusToLocationBar(bool select_all) = 0;
 
   // Does this have an opener associated with it?
   virtual bool HasOpener() const = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_