Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/ui/views/frame/browser_frame_win.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/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <set>
 
@@ skipping 28 matching lines @@
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/menu/native_menu_win.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_win.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 #include "webkit/glue/window_open_disposition.h"
+#include "win8/util/win8_util.h"
 
 #pragma comment(lib, "dwmapi.lib")
 
 // static
 static const int kClientEdgeThickness = 3;
 static const int kTabDragWindowAlpha = 200;
 // We need to offset the DWMFrame into the toolbar so that the blackness
 // doesn't show up on our rounded corners.
 static const int kDWMFrameTopOffset = 3;
 // If not -1, windows are shown with this state.
@@ skipping 36 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameWin, public:
 
 BrowserFrameWin::BrowserFrameWin(BrowserFrame* browser_frame,
                                  BrowserView* browser_view)
     : views::NativeWidgetWin(browser_frame),
       browser_view_(browser_view),
       browser_frame_(browser_frame),
       system_menu_delegate_(new SystemMenuModelDelegate(browser_view,
           browser_view->browser())) {
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     browser_view->SetWindowSwitcherButton(
         MakeWindowSwitcherButton(this, browser_view->IsOffTheRecord()));
   }
 }
 
 BrowserFrameWin::~BrowserFrameWin() {
 }
 
 // static
 void BrowserFrameWin::SetShowState(int state) {
@@ skipping 83 matching lines @@
     GetMetroCurrentTabInfo(w_param);
     return false;
   }
 
   switch (message) {
   case WM_ACTIVATE:
     if (LOWORD(w_param) != WA_INACTIVE)
       minimize_button_metrics_.OnHWNDActivated();
     return false;
   case WM_PRINT:
-    if (base::win::IsMetroProcess()) {
+    if (win8::IsSingleWindowMetroMode()) {
       // This message is sent by the AnimateWindow API which is used in metro
       // mode to flip between active chrome windows.
       RECT client_rect = {0};
       ::GetClientRect(GetNativeView(), &client_rect);
       HDC dest_dc = reinterpret_cast<HDC>(w_param);
       DCHECK(dest_dc);
       HDC src_dc = ::GetDC(GetNativeView());
       ::BitBlt(dest_dc, 0, 0, client_rect.right - client_rect.left,
                client_rect.bottom - client_rect.top, src_dc, 0, 0,
                SRCCOPY);
@@ skipping 83 matching lines @@
 
 void BrowserFrameWin::Close() {
   CloseImmersiveFrame();
   views::NativeWidgetWin::Close();
 }
 
 void BrowserFrameWin::FrameTypeChanged() {
   // In Windows 8 metro mode the frame type is set to FRAME_TYPE_FORCE_CUSTOM
   // by default. We reset it back to FRAME_TYPE_DEFAULT to ensure that we
   // don't end up defaulting to BrowserNonClientFrameView in all cases.
-  if (base::win::IsMetroProcess())
+  if (win8::IsSingleWindowMetroMode())
     browser_frame_->set_frame_type(views::Widget::FRAME_TYPE_DEFAULT);
 
   views::NativeWidgetWin::FrameTypeChanged();
 
   // In Windows 8 metro mode we call Show on the BrowserFrame instance to
   // ensure that the window can be styled appropriately, i.e. no sysmenu,
   // etc.
-  if (base::win::IsMetroProcess())
+  if (win8::IsSingleWindowMetroMode())
     Show();
 }
 
 void BrowserFrameWin::SetFullscreen(bool fullscreen) {
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     HMODULE metro = base::win::GetMetroModule();
     if (metro) {
       MetroSetFullscreen set_full_screen = reinterpret_cast<MetroSetFullscreen>(
         ::GetProcAddress(metro, "SetFullscreen"));
       DCHECK(set_full_screen);
       if (set_full_screen)
         set_full_screen(fullscreen);
     } else {
       NOTREACHED() << "Failed to get metro driver module";
     }
   }
   views::NativeWidgetWin::SetFullscreen(fullscreen);
 }
 
 void BrowserFrameWin::Activate() {
   // In Windows 8 metro mode we have only one window visible at any given time.
   // The Activate code path is typically called when a new browser window is
   // being activated. In metro we need to ensure that the window currently
   // being displayed is hidden and the new window being activated becomes
   // visible. This is achieved by calling AdjustFrameForImmersiveMode()
   // followed by ShowWindow().
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     AdjustFrameForImmersiveMode();
     ::ShowWindow(browser_frame_->GetNativeWindow(), SW_SHOWNORMAL);
   } else {
     views::NativeWidgetWin::Activate();
   }
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameWin, NativeBrowserFrame implementation:
@@ skipping 239 matching lines @@
 // BrowserFrame, public:
 
 // static
 const gfx::Font& BrowserFrame::GetTitleFont() {
   static gfx::Font* title_font =
       new gfx::Font(views::NativeWidgetWin::GetWindowTitleFont());
   return *title_font;
 }
 
 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() {
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     if (ui::GetDisplayLayout() == ui::LAYOUT_DESKTOP)
       return false;
   }
   return !IsMaximized();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameWin(browser_frame, browser_view);
 }