Merge 86845 - Fix hittesting in the OpaqueBrowserFrameView for frames without a tabstrip. The Hi...

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

 // Copyright (c) 2011 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/opaque_browser_frame_view.h"
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
@@ skipping 204 matching lines @@
   return FrameBorderThickness(restored) -
       ((browser_view_->IsTabStripVisible() && !restored &&
       window->IsMaximized()) ? kTabstripTopShadowThickness : 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, BrowserNonClientFrameView implementation:
 
 gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip(
     views::View* tabstrip) const {
-  if (!tabstrip) {
+  if (!tabstrip)
     return gfx::Rect();
-  }
 
   if (browser_view_->UseVerticalTabs()) {
     gfx::Size ps = tabstrip->GetPreferredSize();
     return gfx::Rect(NonClientBorderThickness(),
         NonClientTopBorderHeight(false, false), ps.width(),
         browser_view_->height());
   }
 
   int tabstrip_x = browser_view_->ShouldShowOffTheRecordAvatar() ?
       (otr_avatar_bounds_.right() + kOTRSideSpacing) :
       NonClientBorderThickness() + kTabStripIndent;
 
   int tabstrip_width = minimize_button_->x() - tabstrip_x -
       (frame_->GetWindow()->IsMaximized() ?
       kNewTabCaptionMaximizedSpacing : kNewTabCaptionRestoredSpacing);
-  int tabstrip_height = 0;
-  if (tabstrip)
-    tabstrip_height = tabstrip->GetPreferredSize().height();
   return gfx::Rect(tabstrip_x, GetHorizontalTabStripVerticalOffset(false),
-                   std::max(0, tabstrip_width), tabstrip_height);
+      std::max(0, tabstrip_width), tabstrip->GetPreferredSize().height());
 }
 
 int OpaqueBrowserFrameView::GetHorizontalTabStripVerticalOffset(
     bool restored) const {
   return NonClientTopBorderHeight(restored, true) + ((!restored &&
       (frame_->GetWindow()->IsMaximized() ||
       frame_->GetWindow()->IsFullscreen())) ?
       0 : kNonClientRestoredExtraThickness);
 }
 
@@ skipping 148 matching lines @@
   client_view_bounds_ = CalculateClientAreaBounds(width(), height());
 }
 
 bool OpaqueBrowserFrameView::HitTest(const gfx::Point& l) const {
   // If the point is outside the bounds of the client area, claim it.
   bool in_nonclient = NonClientFrameView::HitTest(l);
   if (in_nonclient)
     return in_nonclient;
 
   // Otherwise claim it only if it's in a non-tab portion of the tabstrip.
-  bool vertical_tabs = browser_view_->UseVerticalTabs();
-  gfx::Rect tabstrip_bounds = GetBoundsForTabStrip(browser_view_->tabstrip());
+  if (!browser_view_->tabstrip())
+    return false;
+  gfx::Rect tabstrip_bounds(browser_view_->tabstrip()->bounds());
   gfx::Point tabstrip_origin(tabstrip_bounds.origin());
   View::ConvertPointToView(frame_->GetWindow()->client_view(),
                            this, &tabstrip_origin);
   tabstrip_bounds.set_origin(tabstrip_origin);
-  if ((!vertical_tabs && l.y() > tabstrip_bounds.bottom()) ||
-      (vertical_tabs && l.x() > tabstrip_bounds.right())) {
+  if (browser_view_->UseVerticalTabs() ?
+      (l.x() > tabstrip_bounds.right()) : (l.y() > tabstrip_bounds.bottom()))
     return false;
-  }
 
   // We convert from our parent's coordinates since we assume we fill its bounds
   // completely. We need to do this since we're not a parent of the tabstrip,
   // meaning ConvertPointToView would otherwise return something bogus.
   gfx::Point browser_view_point(l);
   View::ConvertPointToView(parent(), browser_view_, &browser_view_point);
   return browser_view_->IsPositionInWindowCaption(browser_view_point);
 }
 
 void OpaqueBrowserFrameView::GetAccessibleState(
@@ skipping 660 matching lines @@
 
 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
                                                             int height) const {
   int top_height = NonClientTopBorderHeight(false, false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - GetReservedHeight() -
                        top_height - border_thickness));
 }