Rollback! Now with 25% more HWND.

:-/

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5573 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/chrome/browser/navigation_controller.h b/chrome/browser/navigation_controller.h
index ba805bd..5b5408f 100644
--- a/chrome/browser/navigation_controller.h
+++ b/chrome/browser/navigation_controller.h
@@ -128,7 +128,8 @@ class NavigationController {
   NavigationController(
       Profile* profile,
       const std::vector<TabNavigation>& navigations,
-      int selected_navigation);
+      int selected_navigation,
+      HWND parent);
   ~NavigationController();
 
   // Begin the destruction sequence for this NavigationController and all its
@@ -140,8 +141,8 @@ class NavigationController {
   void Destroy();
 
   // Clone the receiving navigation controller. Only the active tab contents is
-  // duplicated.
-  NavigationController* Clone();
+  // duplicated. It is created as a child of the provided HWND.
+  NavigationController* Clone(HWND hwnd);
 
   // Returns the profile for this controller. It can never be NULL.
   Profile* profile() const {
@@ -433,7 +434,8 @@ class NavigationController {
   // Returns the TabContents for the |entry|'s type. If the TabContents
   // doesn't yet exist, it is created. If a new TabContents is created, its
   // parent is |parent|.  Becomes part of |entry|'s SiteInstance.
-  TabContents* GetTabContentsCreateIfNecessary(const NavigationEntry& entry);
+  TabContents* GetTabContentsCreateIfNecessary(HWND parent,
+                                               const NavigationEntry& entry);
 
   // Register the provided tab contents. This tab contents will be owned
   // and deleted by this navigation controller
@@ -461,7 +463,7 @@ class NavigationController {
   // Invoked after session/tab restore or cloning a tab. Resets the transition
   // type of the entries, updates the max page id and creates the active
   // contents.
-  void FinishRestore(int selected_index);
+  void FinishRestore(HWND parent_hwnd, int selected_index);
 
   // Inserts an entry after the current position, removing all entries after it.
   // The new entry will become the active one.