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

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
===================================================================
--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc	(revision 155826)
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc	(working copy)
@@ -210,8 +210,9 @@
   }
 
   return FrameBorderThickness(restored) -
-      ((browser_view()->IsTabStripVisible() && !restored &&
-      frame()->IsMaximized()) ? kTabstripTopShadowThickness : 0);
+      ((browser_view()->IsTabStripVisible() &&
+          !restored && !frame()->ShouldLeaveOffsetNearTopBorder())
+              ? kTabstripTopShadowThickness : 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -233,7 +234,7 @@
 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.