DevTools: “Dock to right” broken after turning a tab into a window of its own.

chrome/browser/ui/views/frame/browser_view.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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 490 matching lines @@
   // Browser type) and there should be a subsequent re-layout to show it.
   // |contents| can be NULL.
   bool MaybeShowBookmarkBar(TabContents* contents);
 
   // Prepare to show an Info Bar for the specified TabContents. Returns
   // true if there is an Info Bar to show and one is supported for this Browser
   // type, and there should be a subsequent re-layout to show it.
   // |contents| can be NULL.
   bool MaybeShowInfoBar(TabContents* contents);
 
+  // Updates devtools window for given contents. This method will show docked
+  // devtools window for inspected |tab_contents| that has docked devtools
+  // and hide it for NULL or not inspected |tab_contents|. It will also make
+  // sure devtools window size and position are restored for given tab.
+  void UpdateDevToolsForContents(TabContents* tab_contents);
+
   // Shows docked devtools.
-  void ShowDevToolsContainer(DevToolsDockSide side);
+  void ShowDevToolsContainer();
 
   // Hides docked devtools.
   void HideDevToolsContainer();
 
-  // Updates devtools dock side.
-  void SetDevToolsDockSide(DevToolsDockSide side);
-
-  // Updated devtools window for given contents.
-  void UpdateDevToolsForContents(TabContents* tab_contents);
+  // Reads split position from the current tab's devtools window and applies
+  // it to the devtools split.
+  void UpdateDevToolsSplitPosition();
 
   // Updates various optional child Views, e.g. Bookmarks Bar, Info Bar or the
   // Download Shelf in response to a change notification from the specified
   // |contents|. |contents| can be NULL. In this case, all optional UI will be
   // removed.
   void UpdateUIForContents(TabContents* contents);
 
   // Updates an optional child View, e.g. Bookmarks Bar, Info Bar, Download
   // Shelf. If |*old_view| differs from new_view, the old_view is removed and
   // the new_view is added. This is intended to be used when swapping in/out
@@ skipping 129 matching lines @@
   // The view that contains devtools window for the selected WebContents.
   views::WebView* devtools_container_;
 
   // The view managing both the contents_container_ and
   // preview_controller_->preview_container_.
   ContentsContainer* contents_;
 
   // Split view containing the contents container and devtools container.
   views::SingleSplitView* contents_split_;
 
-  // Side to dock devtools to
+  // Side to dock devtools to.
   DevToolsDockSide devtools_dock_side_;
 
+  // Docked devtools window instance. NULL when current tab is not inspected
+  // or is inspected with undocked version of DevToolsWindow.
+  DevToolsWindow* devtools_window_;
+
   // Tracks and stores the last focused view which is not the
   // devtools_container_ or any of its children. Used to restore focus once
   // the devtools_container_ is hidden.
   scoped_ptr<views::ExternalFocusTracker> devtools_focus_tracker_;
 
   // The Status information bubble that appears at the bottom of the window.
   scoped_ptr<StatusBubbleViews> status_bubble_;
 
   // A mapping between accelerators and commands.
   std::map<ui::Accelerator, int> accelerator_table_;
@@ skipping 48 matching lines @@
   scoped_ptr<SearchViewController> search_view_controller_;
 
   scoped_ptr<InstantPreviewControllerViews> preview_controller_;
 
   mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_