Change grow box computation back to a method on BrowserWindow

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

 // 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.
 
 #include "chrome/browser/ui/views/frame/browser_view_layout.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/bookmarks/bookmark_bar_view.h"
@@ skipping 364 matching lines @@
   int overlapped_top = top -
       static_cast<InfoBarContainerView*>(infobar_container_)->
           GetVerticalOverlap(&height);
   infobar_container_->SetBounds(vertical_layout_rect_.x(),
                                 overlapped_top,
                                 vertical_layout_rect_.width(),
                                 height);
   return overlapped_top + height;
 }
 
-// |browser_reserved_rect| is in browser_view_ coordinates.
-// |future_source_bounds| is in |source|'s parent coordinates.
-// |future_parent_offset| is required, since parent view is not moved yet.
-// Note that |future_parent_offset| is relative to browser_view_, not to
-// the parent view.
-void BrowserViewLayout::UpdateReservedContentsRect(
-    const gfx::Rect& browser_reserved_rect,
-    TabContentsContainer* source,
-    const gfx::Rect& future_source_bounds,
-    const gfx::Point& future_parent_offset) {
-  gfx::Point resize_corner_origin(browser_reserved_rect.origin());
-  // Convert |resize_corner_origin| from browser_view_ to source's parent
-  // coordinates.
-  views::View::ConvertPointToView(browser_view_, source->parent(),
-                                  &resize_corner_origin);
-  // Create |reserved_rect| in source's parent coordinates.
-  gfx::Rect reserved_rect(resize_corner_origin, browser_reserved_rect.size());
-  // Apply source's parent future offset to it.
-  reserved_rect.Offset(-future_parent_offset.x(), -future_parent_offset.y());
-  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 calculate 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):
   // contents_split_ -> [contents_container_ | devtools]
 
   gfx::Rect contents_bounds;
   gfx::Rect devtools_bounds;
@@ skipping 15 matching lines @@
     if (!resize_corner_size.IsEmpty()) {
       gfx::Rect bounds = browser_view_->GetContentsBounds();
       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);
     }
   }
 
-  UpdateReservedContentsRect(browser_reserved_rect,
-                             browser_view_->contents_container_,
-                             contents_bounds,
-                             contents_split_offset);
-  UpdateReservedContentsRect(browser_reserved_rect,
-                             browser_view_->devtools_container_,
-                             devtools_bounds,
-                             contents_split_offset);
-
   // Now it's safe to actually resize all contents views in the hierarchy.
   contents_split_->SetBoundsRect(contents_split_bounds);
 }
 
 int BrowserViewLayout::GetTopMarginForActiveContent() {
   if (!active_bookmark_bar_ || !browser_view_->IsBookmarkBarVisible() ||
       !active_bookmark_bar_->IsDetached()) {
     return 0;
   }
 
@@ skipping 24 matching lines @@
   }
 #endif
   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);
 }