diff options
| -rw-r--r-- | chrome/browser/ui/views/frame/glass_browser_frame_view.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc | 18 |
2 files changed, 11 insertions, 18 deletions
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index 9fa33d5..d000d0e 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -265,13 +265,10 @@ void GlassBrowserFrameView::Layout() { bool GlassBrowserFrameView::HitTest(const gfx::Point& l) const { // The ProfileMenuButton intrudes into the client area when the window is // maximized. - if (frame_->GetWindow()->IsMaximized() && show_profile_button() && - profile_button_->IsVisible() && - profile_button_->GetMirroredBounds().Contains(l)) { - return true; - } else { - return !GetWindow()->client_view()->bounds().Contains(l); - } + return (frame_->GetWindow()->IsMaximized() && show_profile_button() && + profile_button_->IsVisible() && + profile_button_->GetMirroredBounds().Contains(l)) || + !GetWindow()->client_view()->bounds().Contains(l); } /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 6a0482b..4ee18185 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -222,9 +222,8 @@ int OpaqueBrowserFrameView::NonClientTopBorderHeight( gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip( views::View* tabstrip) const { - if (!tabstrip) { + if (!tabstrip) return gfx::Rect(); - } if (browser_view_->UseVerticalTabs()) { gfx::Size ps = tabstrip->GetPreferredSize(); @@ -240,11 +239,8 @@ gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip( 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( @@ -413,16 +409,16 @@ bool OpaqueBrowserFrameView::HitTest(const gfx::Point& l) const { 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, |