Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

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 27 matching lines @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/path.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/window/frame_background.h"
 #include "ui/views/window/window_shape.h"
 
 #if defined(OS_WIN)
-#include "base/win/metro.h"
+#include "win8/util/win8_util.h"
 #endif  // OS_WIN
 
 using content::WebContents;
 
 namespace {
 
 // The frame border is only visible in restored mode and is hardcoded to 4 px on
 // each side regardless of the system window border size.
 const int kFrameBorderThickness = 4;
 // Besides the frame border, there's another 9 px of empty space atop the
@@ skipping 52 matching lines @@
                             const views::View* dst, const gfx::Point& pt) {
   DCHECK(src);
   DCHECK(dst);
   gfx::Point origin(bounds.origin());
   views::View::ConvertPointToTarget(src, dst, &origin);
   bounds.set_origin(origin);
   return bounds.Contains(pt);
 }
 
 bool ShouldAddDefaultCaptionButtons() {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  return !base::win::IsMetroProcess();
+#if defined(OS_WIN)

[cpu_(ooo_6.6-7.5), 2012/12/03 20:56:26]

not familiar with this particular change, consider leaving this out and adding
it in a second CL.

[gab, 2012/12/04 00:19:06]

Given it already had #if !defined(USE_AURA); this is keeping the exact same
behavior as before (i.e. always true except on non-ash-Metro-mode).

+  return !win8::IsSingleWindowMetroMode();
 #endif  // OS_WIN
   return true;
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // OpaqueBrowserFrameView, public:
 
 OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame,
@@ skipping 892 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));
 }