Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

content/browser/web_contents/web_contents_impl.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_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 56 matching lines @@
 struct WebIntentServiceData;
 }
 
 class CONTENT_EXPORT WebContentsImpl
     : public NON_EXPORTED_BASE(content::WebContents),
       public content::RenderViewHostDelegate,
       public content::RenderWidgetHostDelegate,
       public RenderViewHostManager::Delegate,
       public content::NotificationObserver {
  public:
-  // See WebContents::Create for a description of these parameters.
-  WebContentsImpl(content::BrowserContext* browser_context,
-                  content::SiteInstance* site_instance,
-                  int routing_id,
-                  const WebContentsImpl* base_web_contents,
-                  WebContentsImpl* opener,
-                  SessionStorageNamespaceImpl* session_storage_namespace);
   virtual ~WebContentsImpl();
 
+  static WebContentsImpl* Create(
+      content::BrowserContext* browser_context,
+      content::SiteInstance* site_instance,
+      int routing_id,
+      const WebContentsImpl* base_web_contents);
+
+  static WebContentsImpl* CreateWithOpener(
+      content::BrowserContext* browser_context,
+      content::SiteInstance* site_instance,
+      int routing_id,
+      const WebContentsImpl* base_web_contents,
+      WebContentsImpl* opener);
+
   // Returns the content specific prefs for the given RVH.
   static webkit_glue::WebPreferences GetWebkitPrefs(
       content::RenderViewHost* rvh, const GURL& url);
 
+  // Complex initialization here. Specifically needed to avoid having
+  // members call back into our virtual functions in the constructor.
+  virtual void Init(content::BrowserContext* browser_context,
+                    content::SiteInstance* site_instance,
+                    int routing_id,
+                    const content::WebContents* base_web_contents);
+
   // Returns the SavePackage which manages the page saving job. May be NULL.
   SavePackage* save_package() const { return save_package_.get(); }
 
   // Updates the max page ID for the current SiteInstance in this
   // WebContentsImpl to be at least |page_id|.
   void UpdateMaxPageID(int32 page_id);
 
   // Updates the max page ID for the given SiteInstance in this WebContentsImpl
   // to be at least |page_id|.
   void UpdateMaxPageIDForSiteInstance(content::SiteInstance* site_instance,
@@ skipping 39 matching lines @@
   }
 
   JavaBridgeDispatcherHostManager* java_bridge_dispatcher_host_manager() const {
     return java_bridge_dispatcher_host_manager_.get();
   }
 
   content::BrowserPluginHost* browser_plugin_host() const {
     return browser_plugin_host_.get();
   }
 
-  // Like GetController from WebContents, but returns the concrete object.
-  NavigationControllerImpl& GetControllerImpl();
-
   // Expose the render manager for testing.
   RenderViewHostManager* GetRenderManagerForTesting();
 
   // content::WebContents ------------------------------------------------------
   virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE;
   virtual base::PropertyBag* GetPropertyBag() OVERRIDE;
   virtual content::WebContentsDelegate* GetDelegate() OVERRIDE;
   virtual void SetDelegate(content::WebContentsDelegate* delegate) OVERRIDE;
-  virtual content::NavigationController& GetController() OVERRIDE;
-  virtual const content::NavigationController& GetController() const OVERRIDE;
+  virtual NavigationControllerImpl& GetController() OVERRIDE;
+  virtual const NavigationControllerImpl& GetController() const OVERRIDE;
   virtual content::BrowserContext* GetBrowserContext() const OVERRIDE;
   virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE;
   virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE;
   virtual content::RenderWidgetHostView*
       GetRenderWidgetHostView() const OVERRIDE;
   virtual content::WebContentsView* GetView() const OVERRIDE;
   virtual content::WebUI* CreateWebUI(const GURL& url) OVERRIDE;
   virtual content::WebUI* GetWebUI() const OVERRIDE;
   virtual content::WebUI* GetCommittedWebUI() const OVERRIDE;
   virtual void SetUserAgentOverride(const std::string& override) OVERRIDE;
@@ skipping 83 matching lines @@
       const content::OpenURLParams& params) OVERRIDE;
 
   // RenderViewHostDelegate ----------------------------------------------------
 
   virtual content::RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
   virtual content::RenderViewHostDelegate::RendererManagement*
       GetRendererManagementDelegate() OVERRIDE;
   virtual bool OnMessageReceived(content::RenderViewHost* render_view_host,
                                  const IPC::Message& message) OVERRIDE;
   virtual const GURL& GetURL() const OVERRIDE;
-  virtual WebContents* GetAsWebContents() OVERRIDE;
+  virtual content::WebContents* GetAsWebContents() OVERRIDE;
   virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
   virtual void RenderViewCreated(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewReady(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewGone(content::RenderViewHost* render_view_host,
                               base::TerminationStatus status,
                               int error_code) OVERRIDE;
   virtual void RenderViewDeleted(
       content::RenderViewHost* render_view_host) OVERRIDE;
@@ skipping 151 matching lines @@
   virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
   virtual void CreateViewAndSetSizeForRVH(
       content::RenderViewHost* rvh) OVERRIDE;
 
   // content::NotificationObserver ---------------------------------------------
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
- protected:
-  friend class content::WebContentsObserver;
-
-  // Add and remove observers for page navigation notifications. Adding or
-  // removing multiple times has no effect. The order in which notifications
-  // are sent to observers is undefined. Clients must be sure to remove the
-  // observer before they go away.
-  void AddObserver(content::WebContentsObserver* observer);
-  void RemoveObserver(content::WebContentsObserver* observer);
 
  private:
   friend class NavigationControllerImpl;
+  friend class content::WebContentsObserver;
+  friend class content::WebContents;  // To implement factory methods.
 
   FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, NoJSMessageOnInterstitials);
   FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, UpdateTitle);
   FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest,
                            CrossSiteCantPreemptAfterUnload);
   FRIEND_TEST_ALL_PREFIXES(FormStructureBrowserTest, HTMLFiles);
   FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, HistoryNavigate);
   FRIEND_TEST_ALL_PREFIXES(RenderViewHostManagerTest, PageDoesBackAndReload);
 
   // So InterstitialPageImpl can access SetIsLoading.
   friend class InterstitialPageImpl;
 
   // TODO(brettw) TestWebContents shouldn't exist!
   friend class content::TestWebContents;
 
+  // See WebContents::Create for a description of these parameters.
+  WebContentsImpl(content::BrowserContext* browser_context,
+                  WebContentsImpl* opener);
+
+  // Add and remove observers for page navigation notifications. Adding or
+  // removing multiple times has no effect. The order in which notifications
+  // are sent to observers is undefined. Clients must be sure to remove the
+  // observer before they go away.
+  void AddObserver(content::WebContentsObserver* observer);
+  void RemoveObserver(content::WebContentsObserver* observer);
+
   // Clears this tab's opener if it has been closed.
   void OnWebContentsDestroyed(content::WebContents* web_contents);
 
   // Callback function when showing JS dialogs.
   void OnDialogClosed(content::RenderViewHost* rvh,
                       IPC::Message* reply_msg,
                       bool success,
                       const string16& user_input);
 
   // IPC message handlers.
@@ skipping 323 matching lines @@
   content::NotificationRegistrar registrar_;
 
   // Used during IPC message dispatching so that the handlers can get a pointer
   // to the RVH through which the message was received.
   content::RenderViewHost* message_source_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
 };
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_