Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc |
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 7713dc478595c7b4d7bd2b4784ddbbfb2ae0c5e2..979fa0ba70ddc70a764fda83de7b11888c1d5dc8 100644 |
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc |
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc |
@@ -325,25 +325,9 @@ bool OpaqueBrowserFrameView::HitTestRect(const gfx::Rect& rect) const { |
return tabstrip->IsRectInWindowCaption(rect_in_tabstrip_coords); |
} |
- // The window switcher button is to the right of the tabstrip but is |
- // part of the client view. |
- views::View* window_switcher_button = |
- browser_view()->window_switcher_button(); |
- if (window_switcher_button && window_switcher_button->visible()) { |
- gfx::RectF rect_in_window_switcher_coords_f(rect); |
- View::ConvertRectToTarget(this, window_switcher_button, |
- &rect_in_window_switcher_coords_f); |
- gfx::Rect rect_in_window_switcher_coords = gfx::ToEnclosingRect( |
- rect_in_window_switcher_coords_f); |
- |
- if (window_switcher_button->HitTestRect(rect_in_window_switcher_coords)) |
- return false; |
- } |
- |
// We claim |rect| because it is above the bottom of the tabstrip, but |
- // neither in the tabstrip nor in the window switcher button. In particular, |
- // the avatar label/button is left of the tabstrip and the window controls |
- // are right of the tabstrip. |
+ // not in the tabstrip itself. In particular, the avatar label/button is left |
+ // of the tabstrip and the window controls are right of the tabstrip. |
return true; |
} |
@@ -503,15 +487,6 @@ int OpaqueBrowserFrameView::GetTabStripHeight() const { |
return browser_view()->GetTabStripHeight(); |
} |
-int OpaqueBrowserFrameView::GetAdditionalReservedSpaceInTabStrip() const { |
- // We don't have the sysmenu buttons in Windows 8 metro mode. However there |
- // are buttons like the window switcher which are drawn in the non client |
- // are in the BrowserView. We need to ensure that the tab strip does not |
- // draw on the window switcher button. |
- views::View* button = browser_view()->window_switcher_button(); |
- return button ? button->width() : 0; |
-} |
- |
gfx::Size OpaqueBrowserFrameView::GetTabstripPreferredSize() const { |
gfx::Size s = browser_view()->tabstrip()->GetPreferredSize(); |
return s; |