Streamline the layout of the BrowserView's children TabContents views....

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

 // Copyright (c) 2010 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/views/frame/browser_view_layout.h"
 
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/download_shelf_view.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/contents_container.h"
+#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "chrome/browser/ui/views/tabs/side_tab_strip.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "gfx/scrollbar_size.h"
+#include "views/controls/single_split_view.h"
 #include "views/window/window.h"
 
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
 #endif
 
 namespace {
 
 // The visible height of the shadow above the tabs. Clicks in this area are
 // treated as clicks to the frame, rather than clicks to the tab.
@@ skipping 170 matching lines @@
   active_bookmark_bar_ = NULL;
   tabstrip_ = NULL;
   browser_view_ = static_cast<BrowserView*>(host);
 }
 
 void BrowserViewLayout::Uninstalled(views::View* host) {}
 
 void BrowserViewLayout::ViewAdded(views::View* host, views::View* view) {
   switch (view->GetID()) {
     case VIEW_ID_CONTENTS_SPLIT: {
-      contents_split_ = view;
+      contents_split_ = static_cast<views::SingleSplitView*>(view);
       // We're installed as the LayoutManager before BrowserView creates the
-      // contents, so we have to set contents_container_ here rather than
+      // contents, so we have to set contents_container_ here rather than in
       // Installed.
       contents_container_ = browser_view_->contents_;
       break;
     }
     case VIEW_ID_INFO_BAR_CONTAINER:
       infobar_container_ = view;
       break;
     case VIEW_ID_DOWNLOAD_SHELF:
       download_shelf_ = static_cast<DownloadShelfView*>(view);
       break;
@@ skipping 133 matching lines @@
 
 int BrowserViewLayout::LayoutInfoBar(int top) {
   bool visible = InfobarVisible();
   int height = visible ? infobar_container_->GetPreferredSize().height() : 0;
   infobar_container_->SetVisible(visible);
   infobar_container_->SetBounds(vertical_layout_rect_.x(), top,
                                 vertical_layout_rect_.width(), height);
   return top + height;
 }
 
+// |browser_reserved_rect| is in browser_view_ coordinates.
+// |future_source_bounds| is in source->GetParent() coordinates.
+void BrowserViewLayout::UpdateReservedContentsRect(
+    const gfx::Rect& browser_reserved_rect, TabContentsContainer* source,
+    const gfx::Rect& future_source_bounds) {
+  gfx::Point resize_corner_origin(browser_reserved_rect.origin());
+  // Convert |resize_corner_origin| from browser_view_ to source->GetParent()
+  // coordinates.
+  views::View::ConvertPointToView(browser_view_, source->GetParent(),
+                                  &resize_corner_origin);
+  // Create |reserved_rect| in source->GetParent() coordinates.
+  gfx::Rect reserved_rect(resize_corner_origin, browser_reserved_rect.size());
+  if (future_source_bounds.Intersects(reserved_rect)) {
+    // |source| is not properly positioned yet to use ConvertPointToView,
+    // so convert it into |source|'s coordinates manually.
+    reserved_rect.Offset(-future_source_bounds.x(), -future_source_bounds.y());
+  } else {
+    reserved_rect = gfx::Rect();
+  }
+
+  source->SetReservedContentsRect(reserved_rect);
+}
+
 void BrowserViewLayout::LayoutTabContents(int top, int bottom) {
+  // The ultimate idea is to calcualte bounds and reserved areas for all
+  // contents views first and then resize them all, so every view
+  // (and its contents) is resized and laid out only once.
+
+  // The views hierarcy (see browser_view.h for more details):
+  // 1) Sidebar is not allowed:
+  //     contents_split_ -> [contents_container_ | devtools]
+  // 2) Sidebar is allowed:
+  //     contents_split_ ->
+  //         [sidebar_split -> [contents_container_ | sidebar]] | devtools
+
+  // contents_split_ is a SingleSplitView, it will adjust cached views rects,
+  // but will not resize these views yet.
   contents_split_->SetBounds(vertical_layout_rect_.x(), top,
                              vertical_layout_rect_.width(), bottom - top);
+
+  // As a SingleSplitView, sidebar_split should be resized upfront too
+  // to let it adjust its own cached views rects.
+  views::SingleSplitView* sidebar_split = browser_view_->sidebar_split_;
+  if (sidebar_split) {
+    DCHECK(sidebar_split == contents_split_->GetChildViewAt(0));
+    sidebar_split->SetBounds(contents_split_->leading_view_rect());
+  }
+
+  // Layout resize corner and sidebar mini tabs and calculate reserved contents
+  // rects here as all contents view bounds are determined, but not yet set
+  // at this point, so contents will be laid out once at most.
+  // TODO(alekseys): layout sidebar minitabs and adjust reserved rect
+  // accordingly.
+  gfx::Rect browser_reserved_rect;
+  if (!browser_view_->frame_->GetWindow()->IsMaximized() &&
+      !browser_view_->frame_->GetWindow()->IsFullscreen()) {
+    gfx::Size resize_corner_size = browser_view_->GetResizeCornerSize();
+    if (!resize_corner_size.IsEmpty()) {
+      gfx::Rect bounds = browser_view_->GetLocalBounds(false);
+      gfx::Point resize_corner_origin(
+          bounds.right() - resize_corner_size.width(),
+          bounds.bottom() - resize_corner_size.height());
+      browser_reserved_rect =
+          gfx::Rect(resize_corner_origin, resize_corner_size);
+    }
+  }
+
+  if (sidebar_split) {
+    UpdateReservedContentsRect(browser_reserved_rect,
+                               browser_view_->contents_container_,
+                               sidebar_split->leading_view_rect());
+    UpdateReservedContentsRect(browser_reserved_rect,
+                               browser_view_->sidebar_container_,
+                               sidebar_split->trailing_view_rect());
+  } else {
+    UpdateReservedContentsRect(browser_reserved_rect,
+                               browser_view_->contents_container_,
+                               contents_split_->leading_view_rect());
+  }
+  UpdateReservedContentsRect(browser_reserved_rect,
+                             browser_view_->devtools_container_,
+                             contents_split_->trailing_view_rect());
+
+  // Now it's safe to actually resize all contents views in the hierarchy.
+  contents_split_->ResizeViews();
+  if (sidebar_split)
+    sidebar_split->ResizeViews();
 }
 
 int BrowserViewLayout::GetTopMarginForActiveContent() {
   if (!active_bookmark_bar_ || !browser_view_->IsBookmarkBarVisible() ||
       !active_bookmark_bar_->IsDetached()) {
     return 0;
   }
 
   if (contents_split_->GetChildViewAt(1) &&
       contents_split_->GetChildViewAt(1)->IsVisible())
@@ skipping 26 matching lines @@
     bottom -= height;
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   // 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);
 }