Prevent the display of the resize corner bitmap on top of the download shelf ...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #include "base/file_version_info.h"
 #include "base/time.h"
@@ skipping 108 matching lines @@
   { false, IDC_RELOAD, IDS_APP_MENU_RELOAD },
   { false, IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD },
   { false, IDC_BACK, IDS_CONTENT_CONTEXT_BACK }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // ResizeCorner, private:
 
 class ResizeCorner : public views::View {
  public:
-  ResizeCorner() {}
+  ResizeCorner(const BrowserWindow* parent)
+      : parent_(parent) {
+  }
+
   virtual void Paint(ChromeCanvas* canvas) {
+    if (parent_ && (parent_->IsMaximized() || parent_->IsFullscreen()))
+      return;
+
     SkBitmap * bitmap = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_TEXTAREA_RESIZER);
     bitmap->buildMipMap(false);
     bool rtl_dir = (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT);
     if (rtl_dir) {
       canvas->TranslateInt(width(), 0);
       canvas->ScaleInt(-1, 1);
       canvas->save();
     }
     canvas->DrawBitmapInt(*bitmap, width() - bitmap->width(),
         height() - bitmap->height());
     if (rtl_dir)
       canvas->restore();
   }
 
   static gfx::Size GetSize() {
     return gfx::Size(views::NativeScrollBar::GetVerticalScrollBarWidth(),
         views::NativeScrollBar::GetHorizontalScrollBarHeight());
   }
 
   virtual gfx::Size GetPreferredSize() {
+    if (parent_ && (parent_->IsMaximized() || parent_->IsFullscreen()))
+      return gfx::Size();
     return 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...
       SetBounds(parent_view->width() - ps.width(),
           parent_view->height() - ps.height(), ps.width(), ps.height());
     }
   }
 
  private:
+  const BrowserWindow* parent_;
   DISALLOW_COPY_AND_ASSIGN(ResizeCorner);
 };
 
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, public:
 
 // static
 void BrowserView::SetShowState(int state) {
   explicit_show_state = state;
@@ skipping 526 matching lines @@
   browser_.reset();
 }
 
 bool BrowserView::IsBookmarkBarVisible() const {
   return SupportsWindowFeature(FEATURE_BOOKMARKBAR) &&
       bookmark_bar_view_.get() &&
       (bookmark_bar_view_->GetPreferredSize().height() != 0);
 }
 
 gfx::Rect BrowserView::GetRootWindowResizerRect() const {
-  // There is no resize corner when we are maximized
-  if (IsMaximized())
+  // There is no resize corner when we are maximized or full screen
+  if (IsMaximized() || 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.
   TabContents* current_tab = browser_->GetSelectedTabContents();
   if (current_tab && current_tab->IsDownloadShelfVisible()) {
     DownloadShelfView* download_shelf = current_tab->GetDownloadShelfView();
@@ skipping 373 matching lines @@
   return true;
 }
 
 int BrowserView::NonClientHitTest(const gfx::Point& point) {
   // Since the TabStrip only renders in some parts of the top of the window,
   // the un-obscured area is considered to be part of the non-client caption
   // area of the window. So we need to treat hit-tests in these regions as
   // hit-tests of the titlebar.
 
   // There is not resize corner when we are maximised
-  if (!IsMaximized()) {
+  if (!IsMaximized() && !IsFullscreen()) {
     CRect client_rect;
     ::GetClientRect(frame_->GetWindow()->GetHWND(), &client_rect);
     gfx::Size resize_corner_size = ResizeCorner::GetSize();
     gfx::Rect resize_corner_rect(client_rect.right - resize_corner_size.width(),
         client_rect.bottom - resize_corner_size.height(),
         resize_corner_size.width(), resize_corner_size.height());
     bool rtl_dir = (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT);
     if (rtl_dir)
       resize_corner_rect.set_x(0);
     if (resize_corner_rect.Contains(point)) {
@@ skipping 313 matching lines @@
   //             InfoBarContainer, DownloadShelfView and TabContents and this
   //             view is sorted out.
   return true;
 }
 
 bool BrowserView::MaybeShowDownloadShelf(TabContents* contents) {
   views::View* new_shelf = NULL;
   if (contents && contents->IsDownloadShelfVisible()) {
     new_shelf = contents->GetDownloadShelfView();
     if (new_shelf != active_download_shelf_)
-      new_shelf->AddChildView(new ResizeCorner());
+      new_shelf->AddChildView(new ResizeCorner(this));
   }
   return UpdateChildViewAndLayout(new_shelf, &active_download_shelf_);
 }
 
 void BrowserView::UpdateUIForContents(TabContents* contents) {
   bool needs_layout = MaybeShowBookmarkBar(contents);
   needs_layout |= MaybeShowInfoBar(contents);
   needs_layout |= MaybeShowDownloadShelf(contents);
   if (needs_layout)
     Layout();
@@ skipping 185 matching lines @@
 
 // static
 void BrowserView::InitClass() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
     initialized = true;
   }
 }