Handle resize corner layout entirely in the platform BrowserWindow*/BrowserView* code...

chrome/browser/ui/views/frame/browser_view.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.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 14 matching lines @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/dom_ui/bug_report_ui.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/ntp_background_util.h"
 #include "chrome/browser/page_info_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sidebar/sidebar_container.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/accessible_view_helper.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
@@ skipping 209 matching lines @@
     return (!window || window->IsMaximized() || window->IsFullscreen()) ?
         gfx::Size() : GetSize();
   }
 
   virtual void Layout() {
     views::View* parent_view = GetParent();
     if (parent_view) {
       gfx::Size ps = GetPreferredSize();
       // No need to handle Right to left text direction here,
       // our parent must take care of it for us...
+      // TODO(alekseys): fix it.
       SetBounds(parent_view->width() - ps.width(),
                 parent_view->height() - ps.height(), ps.width(), ps.height());
     }
   }
 
  private:
   // Returns the WindowWin we're displayed in. Returns NULL if we're not
   // currently in a window.
   views::Window* GetWindow() {
     views::Widget* widget = GetWidget();
@@ skipping 726 matching lines @@
 
 bool BrowserView::IsBookmarkBarAnimating() const {
   return bookmark_bar_view_.get() && bookmark_bar_view_->is_animating();
 }
 
 bool BrowserView::IsToolbarVisible() const {
   return browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
          browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
 }
 
-gfx::Rect BrowserView::GetRootWindowResizerRect() const {
-  if (frame_->GetWindow()->IsMaximized() || frame_->GetWindow()->IsFullscreen())
-    return gfx::Rect();
-
-  // We don't specify a resize corner size if we have a bottom shelf either.
-  // This is because we take care of drawing the resize corner on top of that
-  // shelf, so we don't want others to do it for us in this case.
-  // Currently, the only visible bottom shelf is the download shelf.
-  // Other tests should be added here if we add more bottom shelves.
-  if (download_shelf_.get() && download_shelf_->IsShowing()) {
-    return gfx::Rect();
-  }
-
-  gfx::Rect client_rect = contents_split_->bounds();
-  gfx::Size resize_corner_size = ResizeCorner::GetSize();
-  int x = client_rect.width() - resize_corner_size.width();
-  if (base::i18n::IsRTL())
-    x = 0;
-  return gfx::Rect(x, client_rect.height() - resize_corner_size.height(),
-                   resize_corner_size.width(), resize_corner_size.height());
-}
-
 void BrowserView::DisableInactiveFrame() {
 #if defined(OS_WIN)
   frame_->GetWindow()->DisableInactiveRendering();
 #endif  // No tricks are needed to get the right behavior on Linux.
 }
 
 void BrowserView::ConfirmSetDefaultSearchProvider(
     TabContents* tab_contents,
     TemplateURL* template_url,
     TemplateURLModel* template_url_model) {
@@ skipping 314 matching lines @@
                             false, false, false, true);
 }
 #endif
 
 void BrowserView::ToggleTabStripMode() {
   InitTabStrip(browser_->tabstrip_model());
   frame_->TabStripDisplayModeChanged();
 }
 
 void BrowserView::ShowInstant(TabContents* preview_contents) {
-  if (!preview_container_)
+  if (!preview_container_) {
     preview_container_ = new TabContentsContainer();
+    preview_container_->set_reserved_area_delegate(this);
+  }
   contents_->SetPreview(preview_container_, preview_contents);
   preview_container_->ChangeTabContents(preview_contents);
 }
 
 void BrowserView::HideInstant() {
   if (!preview_container_)
     return;
 
   // The contents must be changed before SetPreview is invoked.
   preview_container_->ChangeTabContents(NULL);
@@ skipping 423 matching lines @@
 }
 
 AccessibilityTypes::Role BrowserView::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_CLIENT;
 }
 
 void BrowserView::InfoBarSizeChanged(bool is_animating) {
   SelectedTabToolbarSizeChanged(is_animating);
 }
 
+void BrowserView::UpdateReservedContentsRect(
+    const TabContentsContainer* source) {
+  RenderWidgetHostView* render_widget_host_view =
+      source->tab_contents() ? source->tab_contents()->GetRenderWidgetHostView()
+                             : NULL;
+  if (!render_widget_host_view)
+    return;
+
+  gfx::Rect reserved_rect;
+
+  if (!frame_->GetWindow()->IsMaximized() &&
+      !frame_->GetWindow()->IsFullscreen()) {
+    gfx::Size resize_corner_size = ResizeCorner::GetSize();
+    if (!resize_corner_size.IsEmpty()) {
+      gfx::Point resize_corner_origin;
+      gfx::Rect bounds = GetLocalBounds(false);
+      resize_corner_origin.set_x(bounds.right() - resize_corner_size.width());
+      resize_corner_origin.set_y(bounds.bottom() - resize_corner_size.height());
+
+      View::ConvertPointToView(this, source, &resize_corner_origin);
+
+      gfx::Size container_size = source->size();
+
+      if (resize_corner_origin.x() < container_size.width() &&
+          resize_corner_origin.y() < container_size.height()) {
+        reserved_rect = gfx::Rect(resize_corner_origin, resize_corner_size);
+      }
+    }
+  }
+
+  // TODO(alekseys): for source == contents_container_, consult SidebarTabView
+  // for the current size to reserve. Something like this:
+  // reserved_rect = reserved_rect.Union(SidebarTabView::GetCurrentBounds());
+
+  render_widget_host_view->set_reserved_contents_rect(reserved_rect);
+}
+
 views::LayoutManager* BrowserView::CreateLayoutManager() const {
   return new BrowserViewLayout;
 }
 
 void BrowserView::InitTabStrip(TabStripModel* model) {
   // Throw away the existing tabstrip if we're switching display modes.
   if (tabstrip_) {
     tabstrip_->GetParent()->RemoveChildView(tabstrip_);
     delete tabstrip_;
   }
@@ skipping 43 matching lines @@
 
   toolbar_ = new ToolbarView(browser_.get());
   AddChildView(toolbar_);
   toolbar_->Init(browser_->profile());
   toolbar_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_TOOLBAR));
 
   infobar_container_ = new InfoBarContainer(this);
   AddChildView(infobar_container_);
 
   contents_container_ = new TabContentsContainer;
+  contents_container_->set_reserved_area_delegate(this);
   contents_ = new ContentsContainer(contents_container_);
 
   SkColor bg_color = GetWidget()->GetThemeProvider()->
       GetColor(BrowserThemeProvider::COLOR_TOOLBAR);
 
   bool sidebar_allowed = SidebarManager::IsSidebarAllowed();
   if (sidebar_allowed) {
     sidebar_container_ = new TabContentsContainer;
+    sidebar_container_->set_reserved_area_delegate(this);
     sidebar_container_->SetID(VIEW_ID_SIDE_BAR_CONTAINER);
     sidebar_container_->SetVisible(false);
 
     sidebar_split_ = new views::SingleSplitView(
         contents_,
         sidebar_container_,
         views::SingleSplitView::HORIZONTAL_SPLIT);
     sidebar_split_->SetID(VIEW_ID_SIDE_BAR_SPLIT);
     sidebar_split_->
         SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_SIDE_BAR));
     sidebar_split_->set_background(
         views::Background::CreateSolidBackground(bg_color));
   }
 
   devtools_container_ = new TabContentsContainer;
+  devtools_container_->set_reserved_area_delegate(this);
   devtools_container_->SetID(VIEW_ID_DEV_TOOLS_DOCKED);
   devtools_container_->SetVisible(false);
 
   views::View* contents_view = contents_;
   if (sidebar_allowed)
     contents_view = sidebar_split_;
 
   contents_split_ = new views::SingleSplitView(
       contents_view,
       devtools_container_,
@@ skipping 556 matching lines @@
       SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }