DevTools: place DevTools WebContents underneath inspected WebContents.

chrome/browser/ui/views/frame/browser_view_layout.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
 
 #include "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h"
-#include "chrome/browser/ui/views/frame/contents_container.h"
+#include "chrome/browser/ui/views/frame/contents_layout_manager.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/fullscreen_exit_bubble_views.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/scrollbar_size.h"
 #include "ui/gfx/size.h"
@@ skipping 46 matching lines @@
   void NotifyPositionRequiresUpdate() {
     FOR_EACH_OBSERVER(ModalDialogHostObserver,
                       observer_list_,
                       OnPositionRequiresUpdate());
   }
 
   // Center horizontally over the content area, with the top overlapping the
   // browser chrome.
   virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE {
     int top_y = browser_view_layout_->web_contents_modal_dialog_top_y_;
-    ContentsContainer* contents_container =
+    views::View* contents_container =
         browser_view_layout_->contents_container_;
     gfx::Rect contents_container_bounds_in_widget =
         contents_container->ConvertRectToWidget(
             contents_container->GetLocalBounds());
     int middle_x = contents_container_bounds_in_widget.x() +
         contents_container_bounds_in_widget.width() / 2;
     return gfx::Point(middle_x - size.width() / 2, top_y);
   }
 
  private:
@@ skipping 42 matching lines @@
 // BrowserViewLayout, public:
 
 BrowserViewLayout::BrowserViewLayout()
     : browser_(NULL),
       browser_view_(NULL),
       top_container_(NULL),
       tab_strip_(NULL),
       toolbar_(NULL),
       bookmark_bar_(NULL),
       infobar_container_(NULL),
-      contents_split_(NULL),
       contents_container_(NULL),
+      contents_layout_manager_(NULL),
       download_shelf_(NULL),
       immersive_mode_controller_(NULL),
       dialog_host_(new WebContentsModalDialogHostViews(this)),
       web_contents_modal_dialog_top_y_(-1) {}
 
 BrowserViewLayout::~BrowserViewLayout() {
 }
 
 void BrowserViewLayout::Init(
     BrowserViewLayoutDelegate* delegate,
     Browser* browser,
     views::ClientView* browser_view,
     views::View* top_container,
     TabStrip* tab_strip,
     views::View* toolbar,
     InfoBarContainerView* infobar_container,
-    views::View* contents_split,
-    ContentsContainer* contents_container,
+    views::View* contents_container,
+    ContentsLayoutManager* contents_layout_manager,
     ImmersiveModeController* immersive_mode_controller) {
   delegate_.reset(delegate);
   browser_ = browser;
   browser_view_ = browser_view;
   top_container_ = top_container;
   tab_strip_ = tab_strip;
   toolbar_ = toolbar;
   infobar_container_ = infobar_container;
-  contents_split_ = contents_split;
   contents_container_ = contents_container;
+  contents_layout_manager_ = contents_layout_manager;
   immersive_mode_controller_ = immersive_mode_controller;
 }
 
 WebContentsModalDialogHost*
     BrowserViewLayout::GetWebContentsModalDialogHost() {
   return dialog_host_.get();
 }
 
 gfx::Size BrowserViewLayout::GetMinimumSize() {
   gfx::Size tabstrip_size(
       browser()->SupportsWindowFeature(Browser::FEATURE_TABSTRIP) ?
       tab_strip_->GetMinimumSize() : gfx::Size());
   gfx::Size toolbar_size(
       (browser()->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
        browser()->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR)) ?
            toolbar_->GetMinimumSize() : gfx::Size());
   if (tabstrip_size.height() && toolbar_size.height())
     toolbar_size.Enlarge(0, -kToolbarTabStripVerticalOverlap);
   gfx::Size bookmark_bar_size;
   if (bookmark_bar_ &&
       bookmark_bar_->visible() &&
       browser()->SupportsWindowFeature(Browser::FEATURE_BOOKMARKBAR)) {
     bookmark_bar_size = bookmark_bar_->GetMinimumSize();
     bookmark_bar_size.Enlarge(0, -bookmark_bar_->GetToolbarOverlap());
   }
   gfx::Size infobar_container_size(infobar_container_->GetMinimumSize());
   // TODO: Adjust the minimum height for the find bar.
 
-  gfx::Size contents_size(contents_split_->GetMinimumSize());
+  gfx::Size contents_size(contents_container_->GetMinimumSize());
 
   int min_height = delegate_->GetTopInsetInBrowserView() +
       tabstrip_size.height() + toolbar_size.height() +
       bookmark_bar_size.height() + infobar_container_size.height() +
       contents_size.height();
   int widths[] = {
         tabstrip_size.width(),
         toolbar_size.width(),
         bookmark_bar_size.width(),
         infobar_container_size.width(),
@@ skipping 143 matching lines @@
 
   top = LayoutBookmarkAndInfoBars(top, browser_view->y());
 
   // Top container requires updated toolbar and bookmark bar to compute bounds.
   UpdateTopContainerBounds();
 
   int bottom = LayoutDownloadShelf(browser_view->height());
   // Treat a detached bookmark bar as if the web contents container is shifted
   // upwards and overlaps it.
   int active_top_margin = GetContentsOffsetForBookmarkBar();
-  contents_container_->SetActiveTopMargin(active_top_margin);
+  contents_layout_manager_->SetActiveTopMargin(active_top_margin);
   top -= active_top_margin;
-  LayoutContentsSplitView(top, bottom);
+  LayoutContentsContainerView(top, bottom);
 
   // This must be done _after_ we lay out the WebContents since this
   // code calls back into us to find the bounding box the find bar
   // must be laid out within, and that code depends on the
   // TabContentsContainer's bounds being up to date.
   if (browser()->HasFindBarController()) {
     browser()->GetFindBarController()->find_bar()->MoveWindowIfNecessary(
         gfx::Rect(), true);
   }
 
@@ skipping 136 matching lines @@
   infobar_container_->SetVisible(InfobarVisible());
   int height;
   int overlapped_top = top - infobar_container_->GetVerticalOverlap(&height);
   infobar_container_->SetBounds(vertical_layout_rect_.x(),
                                 overlapped_top,
                                 vertical_layout_rect_.width(),
                                 height);
   return overlapped_top + height;
 }
 
-void BrowserViewLayout::LayoutContentsSplitView(int top, int bottom) {
-  // |contents_split_| contains web page contents and devtools.
+void BrowserViewLayout::LayoutContentsContainerView(int top, int bottom) {
+  // |contents_container_| contains web page contents and devtools.
   // See browser_view.h for details.
-  gfx::Rect contents_split_bounds(vertical_layout_rect_.x(),
-                                  top,
-                                  vertical_layout_rect_.width(),
-                                  std::max(0, bottom - top));
-  contents_split_->SetBoundsRect(contents_split_bounds);
+  gfx::Rect contents_container_bounds(vertical_layout_rect_.x(),
+                                      top,
+                                      vertical_layout_rect_.width(),
+                                      std::max(0, bottom - top));
+  contents_container_->SetBoundsRect(contents_container_bounds);
 }
 
 void BrowserViewLayout::UpdateTopContainerBounds() {
   gfx::Rect top_container_bounds(top_container_->GetPreferredSize());
 
   // If the immersive mode controller is animating the top container, it may be
   // partly offscreen. The top container is positioned relative to the top of
   // the client view instead of relative to GetTopInsetInBrowserView() because
   // the top container paints parts of the frame (title, window controls) during
   // an immersive reveal.
   top_container_bounds.set_y(
       immersive_mode_controller_->GetTopContainerVerticalOffset(
           top_container_bounds.size()));
   top_container_->SetBoundsRect(top_container_bounds);
 }
 
 int BrowserViewLayout::GetContentsOffsetForBookmarkBar() {
   // If the bookmark bar is hidden or attached to the omnibox the web contents
   // will appear directly underneath it and does not need an offset.
   if (!bookmark_bar_ ||
       !delegate_->IsBookmarkBarVisible() ||
       !bookmark_bar_->IsDetached()) {
     return 0;
   }
 
-  // Dev tools.
-  if (contents_split_->child_at(1) && contents_split_->child_at(1)->visible())
-    return 0;
-
   // Offset for the detached bookmark bar.
   return bookmark_bar_->height() -
       bookmark_bar_->GetFullyDetachedToolbarOverlap();
 }
 
 int BrowserViewLayout::LayoutDownloadShelf(int bottom) {
   if (delegate_->DownloadShelfNeedsLayout()) {
     bool visible = browser()->SupportsWindowFeature(
         Browser::FEATURE_DOWNLOADSHELF);
     DCHECK(download_shelf_);
     int height = visible ? download_shelf_->GetPreferredSize().height() : 0;
     download_shelf_->SetVisible(visible);
     download_shelf_->SetBounds(vertical_layout_rect_.x(), bottom - height,
                                vertical_layout_rect_.width(), height);
     download_shelf_->Layout();
     bottom -= height;
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // Cast to a views::View to access GetPreferredSize().
   views::View* infobar_container = infobar_container_;
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser_->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container->GetPreferredSize().height() != 0);
 }