Implement base::win::IsMetroProcess.

chrome/browser/ui/views/frame/browser_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/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 1295 matching lines @@
   return contents_->GetPreviewBounds();
 }
 
 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
     const gfx::Rect& bounds) {
 #if defined(OS_WIN)
 #if defined(USE_AURA)
   return NEW_POPUP;
 #else
   // If we are in windows metro-mode, we can't allow popup windows.
-  return (base::win::GetMetroModule() == NULL) ? NEW_POPUP : NEW_BACKGROUND_TAB;
+  return base::win::InMetroMode() ? NEW_BACKGROUND_TAB : NEW_POPUP;
 #endif
 #else
   return NEW_POPUP;
 #endif
 }
 
 FindBar* BrowserView::CreateFindBar() {
   return browser::CreateFindBar(this);
 }
 
@@ skipping 155 matching lines @@
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 bool BrowserView::ExecuteWindowsCommand(int command_id) {
   // This function handles WM_SYSCOMMAND, WM_APPCOMMAND, and WM_COMMAND.
 #if defined(OS_WIN) && !defined(USE_AURA)
   if (command_id == IDC_DEBUG_FRAME_TOGGLE)
     GetWidget()->DebugToggleFrameType();
 
   // In Windows 8 metro mode prevent sizing and moving.
-  if (base::win::GetMetroModule()) {
+  if (base::win::InMetroMode()) {
     // Windows uses the 4 lower order bits of |notification_code| for type-
     // specific information so we must exclude this when comparing.
     static const int sc_mask = 0xFFF0;
     if (((command_id & sc_mask) == SC_MOVE) ||
         ((command_id & sc_mask) == SC_SIZE) ||
         ((command_id & sc_mask) == SC_MAXIMIZE))
       return true;
   }
 #endif
   // Translate WM_APPCOMMAND command ids into a command id that the browser
@@ skipping 295 matching lines @@
 void BrowserView::OnSysColorChange() {
   browser::MaybeShowInvertBubbleView(browser_->profile(), contents_);
 }
 
 int BrowserView::GetOTRIconResourceID() const {
   int otr_resource_id = IDR_OTR_ICON;
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
     if (IsFullscreen())
       otr_resource_id = IDR_OTR_ICON_FULLSCREEN;
 #if defined(OS_WIN) && !defined(USE_AURA)
-    if (base::win::GetMetroModule() != NULL)
+    if (base::win::InMetroMode() != NULL)

[ananta, 2012/06/15 21:46:19]

remove != NULL

[Sigurður Ásgeirsson, 2012/06/18 13:54:15]

Done.

       otr_resource_id = IDR_OTR_ICON_FULLSCREEN;
 #endif
   }
 
   return otr_resource_id;
 }
 
 views::LayoutManager* BrowserView::CreateLayoutManager() const {
   return new BrowserViewLayout;
 }
@@ skipping 654 matching lines @@
           this,
           tab_contents->web_contents()->GetRenderViewHost(),
           password_generator,
           browser_.get(),
           tab_contents->password_manager());
 
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR);
   bubble->Show();
 }