DevTools: place DevTools WebContents underneath inspected WebContents.

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 27 matching lines @@
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
 #include "chrome/browser/hang_monitor/hung_window_detector.h"
 #endif
 
 // NOTE: For more information about the objects and files in this directory,
 // view: http://dev.chromium.org/developers/design-documents/browser-window
 
 class BookmarkBarView;
 class Browser;
 class BrowserViewLayout;
-class ContentsContainer;
+class ContentsLayoutManager;
 class DownloadShelfView;
 class FullscreenExitBubbleViews;
 class InfoBarContainerView;
 class LocationBarView;
 class StatusBubbleViews;
 class SearchViewController;
 class TabStrip;
 class TabStripModel;
 class ToolbarView;
 class TopContainerView;
@@ skipping 27 matching lines @@
 //  including the TabStrip, toolbars, download shelves, the content area etc.
 //
 class BrowserView : public BrowserWindow,
                     public BrowserWindowTesting,
                     public TabStripModelObserver,
                     public ui::AcceleratorProvider,
                     public views::WidgetDelegate,
                     public views::WidgetObserver,
                     public views::ClientView,
                     public InfoBarContainer::Delegate,
                     public views::SingleSplitViewListener,

[sky, 2013/12/06 17:25:44]

I don't believe this is needed anymore. Make sure you also nuke any includes
that are now obsolete.

[dgozman, 2013/12/09 13:19:18]

Done.

                     public gfx::SysColorChangeListener,
                     public LoadCompleteListener::Delegate,
                     public OmniboxPopupModelObserver {
  public:
   // The browser view's class name.
   static const char kViewClassName[];
 
   BrowserView();
   virtual ~BrowserView();
 
@@ skipping 342 matching lines @@
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from ui::AcceleratorTarget:
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
 
   // OmniboxPopupModelObserver overrides
   virtual void OnOmniboxPopupShownOrHidden() OVERRIDE;
 
   // Testing interface:
-  views::SingleSplitView* GetContentsSplitForTest() { return contents_split_; }
-  ContentsContainer* GetContentsContainerForTest() {
-    return contents_container_;
-  }
+  views::View* GetContentsContainerForTest() { return contents_container_; }
   views::WebView* GetContentsWebViewForTest() { return contents_web_view_; }
+  views::WebView* GetDevToolsWebViewForTest() { return devtools_web_view_; }
 
  private:
   // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
   // interface to keep these two classes decoupled and testable.
   friend class BrowserViewLayoutDelegateImpl;
   FRIEND_TEST_ALL_PREFIXES(BrowserViewTest, BrowserView);
   FRIEND_TEST_ALL_PREFIXES(BrowserViewsAccessibilityTest,
                            TestAboutChromeViewAccObj);
 
   enum FullscreenType {
@@ skipping 11 matching lines @@
   // Callback for the loading animation(s) associated with this view.
   void LoadingAnimationCallback();
 
   // LoadCompleteListener::Delegate implementation. Creates and initializes the
   // |jumplist_| after the first page load.
   virtual void OnLoadCompleted() OVERRIDE;
 
   // Returns the BrowserViewLayout.
   BrowserViewLayout* GetBrowserViewLayout() const;
 
+  // Returns the ContentsLayoutManager.
+  ContentsLayoutManager* GetContentsLayoutManager() const;
+
   // Layout the Status Bubble.
   void LayoutStatusBubble();
 
   // Prepare to show the Bookmark Bar for the specified WebContents.
   // Returns true if the Bookmark Bar can be shown (i.e. it's supported for this
   // Browser type) and there should be a subsequent re-layout to show it.
   // |contents| can be NULL.
   bool MaybeShowBookmarkBar(content::WebContents* contents);
 
   // Moves the bookmark bar view to the specified parent, which may be NULL,
   // |this|, or |top_container_|. Ensures that |top_container_| stays in front
   // of |bookmark_bar_view_|.
   void SetBookmarkBarParent(views::View* new_parent);
 
   // Prepare to show an Info Bar for the specified WebContents. 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(content::WebContents* contents);
 
   // Updates devtools window for given contents. This method will show docked
   // devtools window for inspected |web_contents| that has docked devtools
   // and hide it for NULL or not inspected |web_contents|. It will also make
   // sure devtools window size and position are restored for given tab.
-  void UpdateDevToolsForContents(content::WebContents* web_contents);
-
-  // Shows docked devtools.
-  void ShowDevToolsContainer();
-
-  // Hides docked devtools.
-  void HideDevToolsContainer();
-
-  // Reads split position from the current tab's devtools window and applies
-  // it to the devtools split.
-  void UpdateDevToolsSplitPosition();
+  // This method will not update actual DevTools WebContents, if not
+  // |update_devtools_web_contents|. In this case, manual update is required.
+  void UpdateDevToolsForContents(content::WebContents* web_contents,
+                                 bool update_devtools_web_contents);
 
   // 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(content::WebContents* contents);
 
   // Invoked to update the necessary things when our fullscreen state changes
   // to |fullscreen|. On Windows this is invoked immediately when we toggle the
   // full screen state. On Linux changing the fullscreen state is async, so we
@@ skipping 64 matching lines @@
   // |  --------------------------------------------------------------  |
   // |  | Tabs (tabstrip_)                                           |  |
   // |  |------------------------------------------------------------|  |
   // |  | Navigation buttons, address bar, menu (toolbar_)           |  |
   // |  --------------------------------------------------------------  |
   // |------------------------------------------------------------------|
   // | All infobars (infobar_container_) [1]                            |
   // |------------------------------------------------------------------|
   // | Bookmarks (bookmark_bar_view_) [1]                               |
   // |------------------------------------------------------------------|
-  // | Debugger splitter (contents_split_)                              |
+  // | Contents container (contents_container_)                         |
   // |  --------------------------------------------------------------  |
-  // |  | Page content (contents_container_)                         |  |
-  // |  |  --------------------------------------------------------  |  |
-  // |  |  | contents_web_view_                                   |  |  |
-  // |  |  --------------------------------------------------------  |  |
-  // |  --------------------------------------------------------------  |
-  // |  --------------------------------------------------------------  |
-  // |  | Debugger (devtools_container_)                             |  |
-  // |  |                                                            |  |
+  // |  |  devtools_web_view_                                        |  |
+  // |  |------------------------------------------------------------|  |
+  // |  |  contents_web_view_                                        |  |
   // |  --------------------------------------------------------------  |
   // |------------------------------------------------------------------|
   // | Active downloads (download_shelf_)                               |
   // --------------------------------------------------------------------
   //
   // [1] The bookmark bar and info bar are swapped when on the new tab page.
   //     Additionally when the bookmark bar is detached, contents_container_ is
   //     positioned on top of the bar while the tab's contents are placed below
   //     the bar.  This allows the find bar to always align with the top of
   //     contents_container_ regardless if there's bookmark or info bars.
@@ skipping 26 matching lines @@
   // The download shelf view (view at the bottom of the page).
   scoped_ptr<DownloadShelfView> download_shelf_;
 
   // The InfoBarContainerView that contains InfoBars for the current tab.
   InfoBarContainerView* infobar_container_;
 
   // The view that contains the selected WebContents.
   views::WebView* contents_web_view_;
 
   // The view that contains devtools window for the selected WebContents.
-  views::WebView* devtools_container_;
+  views::WebView* devtools_web_view_;
 
-  // The view managing the |contents_web_view_|.
-  ContentsContainer* contents_container_;
-
-  // Split view containing the contents container and devtools container.
-  views::SingleSplitView* contents_split_;
-
-  // Side to dock devtools to.
-  DevToolsDockSide devtools_dock_side_;
+  // The view managing the devtools and contents positions.
+  // Handled by ContentsLayoutManager.
+  views::View* contents_container_;
 
   // 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.
+  // devtools_web_view_ or any of its children. Used to restore focus once
+  // the devtools_web_view_ 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_;
 
   // True if we have already been initialized.
   bool initialized_;
@@ skipping 43 matching lines @@
   scoped_ptr<ScrollEndEffectController> scroll_end_effect_controller_;
 
   gfx::ScopedSysColorChangeListener color_change_listener_;
 
   mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_