Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/ui/browser_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/browser.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/win/metro.h"

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

do we need metro.h here?

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

Yes, remaining base::win::GetMetroModule() below.

 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #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 {
 
 void NewMetroWindow(Browser* source_browser, Profile* profile) {
   typedef void (*FlipFrameWindows)();
 
   static FlipFrameWindows flip_window_fn = reinterpret_cast<FlipFrameWindows>(
       ::GetProcAddress(base::win::GetMetroModule(), "FlipFrameWindows"));
   DCHECK(flip_window_fn);
 
@@ skipping 14 matching lines @@
     // browser window to be hidden and the next window to be shown.
     flip_window_fn();
   }
 }
 
 }  // namespace
 
 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());
 }
 

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

these two functions should call a single local function that takes a Brower* and
a Profile*

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

Sure, but I don't feel this is related to this change which simply maps the old
call to the new call.

[cpu_(ooo_6.6-7.5), 2012/12/04 01:00:51]

It is related. You are adding code that can be de-duplicated, sure duplicated
code was there before but that is besides the point.

Janitorial tasks like that happen to the best of us, just ask grt@

On 2012/12/04 00:19:06, gab wrote:

[gab, 2012/12/04 18:47:42]

Ok, done.

 }  // namespace chrome
 
 void Browser::SetMetroSnapMode(bool enable) {
   fullscreen_controller_->SetMetroSnapMode(enable);
 }