Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

content/browser/renderer_host/render_widget_host_view_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 "content/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 #include <map>
 #include <stack>
 
@@ skipping 48 matching lines @@
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
+#include "win8/util/win8_util.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 using ui::ViewProp;
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
 using WebKit::WebMouseEvent;
 using WebKit::WebTextDirection;
 
 namespace content {
@@ skipping 653 matching lines @@
   // We've been told to destroy.
   // By clearing close_on_deactivate_, we prevent further deactivations
   // (caused by windows messages resulting from the DestroyWindow) from
   // triggering further destructions.  The deletion of this is handled by
   // OnFinalMessage();
   close_on_deactivate_ = false;
   render_widget_host_ = NULL;
   being_destroyed_ = true;
   CleanupCompositorWindow();
 
-  if (is_fullscreen_ && base::win::IsMetroProcess()) {
+  if (is_fullscreen_ && win8::IsSingleWindowMetroMode()) {
     MetroCloseFrameWindow close_frame_window =
         reinterpret_cast<MetroCloseFrameWindow>(
             ::GetProcAddress(base::win::GetMetroModule(), "CloseFrameWindow"));
     DCHECK(close_frame_window);
     close_frame_window(m_hWnd);
   }
 
   DestroyWindow();
 }
 
@@ skipping 2018 matching lines @@
   // Do not touch any members at this point, |this| has been deleted.
 }
 
 void RenderWidgetHostViewWin::DoPopupOrFullscreenInit(HWND parent_hwnd,
                                                       const gfx::Rect& pos,
                                                       DWORD ex_style) {
   Create(parent_hwnd, NULL, NULL, WS_POPUP, ex_style);
   MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE);
   ShowWindow(IsActivatable() ? SW_SHOW : SW_SHOWNA);
 
-  if (is_fullscreen_ && base::win::IsMetroProcess()) {
+  if (is_fullscreen_ && win8::IsSingleWindowMetroMode()) {
     MetroSetFrameWindow set_frame_window =
         reinterpret_cast<MetroSetFrameWindow>(
             ::GetProcAddress(base::win::GetMetroModule(), "SetFrameWindow"));
     DCHECK(set_frame_window);
     set_frame_window(m_hWnd);
   }
 }
 
 CPoint RenderWidgetHostViewWin::GetClientCenter() const {
   CRect rect;
@@ skipping 188 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewWin(widget);
 }
 
 }  // namespace content