Ensure that the window switcher in Chrome metro mode on Windows 8 works with themes. Currently it i…

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

 // Copyright (c) 2012 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 <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 568 matching lines @@
   } else {
     // For "browser mode" windows, we use the native positioning, which is just
     // below the top frame border.
     y = frame_thickness;
   }
   return gfx::Rect(frame_thickness + kIconLeftSpacing, y, size, size);
 }
 
 gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStripAndAvatarArea(
     views::View* tabstrip) const {
-  const int available_width =
-      minimize_button_ ? minimize_button_->x() : width();
+  int available_width = width();
+  if (minimize_button_) {
+    available_width = minimize_button_->x();
+  } else if (browser_view()->window_switcher_button()) {
+    // 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.
+    available_width -= browser_view()->window_switcher_button()->width();
+  }
   const int caption_spacing = frame()->IsMaximized() ?
       kNewTabCaptionMaximizedSpacing : kNewTabCaptionRestoredSpacing;
   const int tabstrip_x = NonClientBorderThickness();
   const int tabstrip_width = available_width - tabstrip_x - caption_spacing;
   return gfx::Rect(tabstrip_x, GetTabStripInsets(false).top,
                    std::max(0, tabstrip_width),
                    tabstrip->GetPreferredSize().height());
 }
 
 void OpaqueBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
@@ skipping 437 matching lines @@
 
 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
                                                             int height) const {
   int top_height = NonClientTopBorderHeight(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));
 }