Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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 112 matching lines @@
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(USE_ASH)
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/window_positioner.h"
-#elif defined(OS_WIN) && !defined(USE_AURA)
-#include "base/win/metro.h"
-#include "chrome/browser/jumplist_win.h"
-#include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
-#include "ui/views/widget/native_widget_win.h"
-#include "ui/views/win/scoped_fullscreen_visibility.h"
 #endif
 
 #if defined(USE_AURA)
 #include "chrome/browser/ui/views/accelerator_table.h"
 #include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/screen.h"
+#elif defined(OS_WIN)

[robertshield, 2012/12/03 19:48:48]

I feel that this would be more readable as a standalone block:
#if defined(OS_WIN) && !defined(USE_AURA)

Alternatively, at least add a comment to the end along the lines of //
!defined(USE_AURA).

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

Ok, added comment at end of line.

+#include "chrome/browser/jumplist_win.h"
+#include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
+#include "ui/views/widget/native_widget_win.h"
+#include "ui/views/win/scoped_fullscreen_visibility.h"
+#endif
+
+#if defined(OS_WIN)
+#include "win8/util/win8_util.h"
 #endif
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h"
 #endif
 
 using base::TimeDelta;
 using content::NativeWebKeyboardEvent;
 using content::SSLStatus;
 using content::UserMetricsAction;
@@ skipping 21 matching lines @@
 // Returned from BrowserView::GetClassName.
 const char BrowserView::kViewClassName[] = "browser/ui/views/BrowserView";
 // static
 const int BrowserView::kTabstripIndex = 0;
 const int BrowserView::kInfoBarIndex = 1;
 const int BrowserView::kToolbarIndex = 2;
 
 namespace {
 
 bool ShouldSaveOrRestoreWindowPos() {
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
   // In Windows 8 metro mode the window is always maximized (without the

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

reword

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

Done.

-  // WS_MAXIMIZE) style.
-  if (base::win::IsMetroProcess())
+  // WS_MAXIMIZE style).
+  if (win8::IsSingleWindowMetroMode())
     return false;
 #endif
   return true;
 }
 
 #if !defined(USE_AURA)
 // Draw the background to match the new tab page. The trick is to align it
 // properly because without Aura, the bookmark bar is not drawn as a semi
 // transparent layer on top of the ntp, instead, the ntp is cropped and the bar
 // is drawn below it. This code could live in ntp_background_util.cc, but won't
@@ skipping 1343 matching lines @@
   return contents_->GetPreviewBounds();
 }
 
 bool BrowserView::IsInstantTabShowing() {
   return preview_controller_->preview() != NULL;
 }
 
 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.

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

reword

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

Done.

-  return base::win::IsMetroProcess() ? NEW_BACKGROUND_TAB : NEW_POPUP;
-#endif
+  return win8::IsSingleWindowMetroMode() ? NEW_BACKGROUND_TAB : NEW_POPUP;
 #else
   return NEW_POPUP;
 #endif
 }
 
 FindBar* BrowserView::CreateFindBar() {
   return chrome::CreateFindBar(this);
 }
 
 bool BrowserView::GetConstrainedWindowTopY(int* top_y) {
@@ skipping 212 matching lines @@
   // For Ash only, app host windows do not show an icon, crbug.com/119411.
   // Child windows (e.g. extension panels, popups) do show an icon.
   if (browser_->is_app() && browser_->app_type() == Browser::APP_TYPE_HOST)
     return false;
 #endif
   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 defined(OS_WIN)
   if (command_id == IDC_DEBUG_FRAME_TOGGLE)
     GetWidget()->DebugToggleFrameType();

[robertshield, 2012/12/03 19:48:48]

this introduces a change in behaviour for the line above. Is that intended?

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

This is can only ever be called if switches::kDebugEnableFrameToggle (see
definition below) is specified on the command-line. I figured it wasn't worth
adding an extra #if !defined(USE_AURA) around this since if it's broken for aura
builds, the developer should simply not be using this command-line or fix it if
he cares imo... let me know if you feel otherwise.

// Enables a frame context menu item that toggles the frame in and out of glass
// mode (Windows Vista and up only).
const char kDebugEnableFrameToggle[]        = "debug-enable-frame-toggle";

 
   // In Windows 8 metro mode prevent sizing and moving.
-  if (base::win::IsMetroProcess()) {
+  if (win8::IsSingleWindowMetroMode()) {
     // 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 315 matching lines @@
 
 void BrowserView::OnSysColorChange() {
   chrome::MaybeShowInvertBubbleView(browser_.get(), 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::IsMetroProcess())
+#if defined(OS_WIN)
+    if (win8::IsSingleWindowMetroMode())
       otr_resource_id = IDR_OTR_ICON_FULLSCREEN;
 #endif
   }
 
   return otr_resource_id;
 }
 
 views::LayoutManager* BrowserView::CreateLayoutManager() const {
   return new BrowserViewLayout;
 }
@@ skipping 644 matching lines @@
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }
 
 void BrowserView::MaybeStackBookmarkBarAtTop() {
   if (bookmark_bar_view_.get())
     bookmark_bar_view_->MaybeStackAtTop();
 }