Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/ui/browser_win.cc

Index: chrome/browser/ui/browser_win.cc
diff --git a/chrome/browser/ui/browser_win.cc b/chrome/browser/ui/browser_win.cc
index f123e247adb0b34a3d8741abab11e4f5503c3fc2..60bae8832780b84474b530a73a6191f8114fac10 100644
--- a/chrome/browser/ui/browser_win.cc
+++ b/chrome/browser/ui/browser_win.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "win8/util/win8_util.h"
 
 namespace {
 
@@ -47,23 +48,19 @@ void NewMetroWindow(Browser* source_browser, Profile* profile) {
 namespace chrome {
 
 void NewWindow(Browser* browser) {
-#if !defined(USE_AURA)
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     NewMetroWindow(browser, browser->profile()->GetOriginalProfile());
     return;
   }
-#endif
   NewEmptyWindow(browser->profile()->GetOriginalProfile(),
                  browser->host_desktop_type());
 }
 
 void NewIncognitoWindow(Browser* browser) {
-#if !defined(USE_AURA)
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     NewMetroWindow(browser, browser->profile()->GetOffTheRecordProfile());
     return;
   }
-#endif
   NewEmptyWindow(browser->profile()->GetOffTheRecordProfile(),
                  browser->host_desktop_type());
 }