Ensure that the tabstrip is drawn at the top of the caption in Windows 8 metro mode if we are launc…

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 192 matching lines @@
   // |delegate| may be NULL if called from callback of InputMethodChanged while
   // a window is being destroyed.
   // See more discussion at http://crosbug.com/8958
   if (delegate && delegate->ShouldShowWindowTitle()) {
     return std::max(FrameBorderThickness(restored) + IconSize(),
         CaptionButtonY(restored) + kCaptionButtonHeightWithPadding) +
         TitlebarBottomThickness(restored);
   }
 
   return FrameBorderThickness(restored) -
-      ((browser_view()->IsTabStripVisible() && !restored &&
-      frame()->IsMaximized()) ? kTabstripTopShadowThickness : 0);
+      ((browser_view()->IsTabStripVisible() &&
+          !restored && !frame()->ShouldLeaveOffsetNearTopBorder())
+              ? kTabstripTopShadowThickness : 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, BrowserNonClientFrameView implementation:
 
 gfx::Rect OpaqueBrowserFrameView::GetBoundsForTabStrip(
     views::View* tabstrip) const {
   if (!tabstrip)
     return gfx::Rect();
 
   gfx::Rect bounds = GetBoundsForTabStripAndAvatarArea(tabstrip);
   const int space_left_of_tabstrip = browser_view()->ShouldShowAvatar() ?
       (kAvatarLeftSpacing + avatar_bounds_.width() + kAvatarRightSpacing) :
       kTabStripIndent;
   bounds.Inset(space_left_of_tabstrip, 0, 0, 0);
   return bounds;
 }
 
 BrowserNonClientFrameView::TabStripInsets
 OpaqueBrowserFrameView::GetTabStripInsets(bool restored) const {
   int top = NonClientTopBorderHeight(restored) + ((!restored &&
-      (frame()->IsMaximized() ||
+      (!frame()->ShouldLeaveOffsetNearTopBorder() ||
       frame()->IsFullscreen())) ?
       0 : kNonClientRestoredExtraThickness);
   // TODO: include OTR and caption.
   return TabStripInsets(top, 0, 0);
 }
 
 int OpaqueBrowserFrameView::GetThemeBackgroundXInset() const {
   return 0;
 }
 
@@ skipping 799 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));
 }