Move SessionStorageNamespace entirely into NavigationController and support StoragePartitions.

content/public/browser/navigation_controller.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_NAVIGATION_CONTROLLER_H_
 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
+#include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/common/page_transition_types.h"
 
 class GURL;
 
 namespace content {
 
 class BrowserContext;
 class NavigationEntry;
 class SessionStorageNamespace;
 class WebContents;
 struct Referrer;
 
+// Used to store the mapping of a StoragePartion id to SessionStorageNamespace.

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

StoragePartition

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

Done.

+typedef std::map<std::string, scoped_refptr<SessionStorageNamespace> >
+    SessionStorageNamespaceMap;

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

Topic for discussion: would it be better for this to be exposed as its own type,
rather than having several places in the code depend on navigation_controller.h
to get this typedef?

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

General rule is not to go to large lengths to avoid header dependencies, but I
don't feel too strongly about it.

+
 // A NavigationController maintains the back-forward list for a WebContents and
 // manages all navigation within that list.
 //
 // Each NavigationController belongs to one WebContents; each WebContents has
 // exactly one NavigationController.
 class NavigationController {
  public:
   enum ReloadType {
     NO_RELOAD,                // Normal load.
     RELOAD,                   // Normal (cache-validating) reload.
@@ skipping 184 matching lines @@
 
   // Removing of entries -------------------------------------------------------
 
   // Removes the entry at the specified |index|.  This call dicards any pending
   // and transient entries.  If the index is the last committed index, this does
   // nothing and returns false.
   virtual void RemoveEntryAtIndex(int index) = 0;
 
   // Random --------------------------------------------------------------------
 
-  // The session storage namespace that all child render views should use.
-  virtual SessionStorageNamespace* GetSessionStorageNamespace() const = 0;
+  // The session storage namespace that all child render views of a renderer

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

nits: all child RenderViews in the renderer process with the given ID should
use.

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

Done.

+  // for the given renderer_id should use.
+  virtual SessionStorageNamespace* GetSessionStorageNamespace(
+      int renderer_id) = 0;
+
+  // Returns all the SessionStorageNamespace objects that this
+  // NavigationController knows about.
+  virtual const SessionStorageNamespaceMap&
+      GetSessionStorageNamespaceMap() const = 0;
 
   // Sets the max restored page ID this NavigationController has seen, if it
   // was restored from a previous session.
   virtual void SetMaxRestoredPageID(int32 max_id) = 0;
 
   // Returns the largest restored page ID seen in this navigation controller,
   // if it was restored from a previous session.  (-1 otherwise)
   virtual int32 GetMaxRestoredPageID() const = 0;
 
   // Returns true if a reload happens when activated (SetActive(true) is
@@ skipping 28 matching lines @@
   virtual void CopyStateFromAndPrune(NavigationController* source) = 0;
 
   // Removes all the entries except the active entry. If there is a new pending
   // navigation it is preserved.
   virtual void PruneAllButActive() = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_