Removes win8_util

chrome/browser/ui/toolbar/wrench_menu_model.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/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 48 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/enumerate_modules_model_win.h"
 #include "chrome/browser/ui/metro_pin_tab_helper_win.h"
 #include "content/public/browser/gpu_data_manager.h"
-#include "win8/util/win8_util.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #endif
 
 using base::UserMetricsAction;
 using content::HostZoomMap;
 using content::WebContents;
 
@@ skipping 395 matching lines @@
     : ui::SimpleMenuModel(this),
       provider_(NULL),
       browser_(NULL),
       tab_strip_model_(NULL) {
 }
 
 bool WrenchMenuModel::ShouldShowNewIncognitoWindowMenuItem() {
   if (browser_->profile()->IsManaged())
     return false;
 
-#if defined(OS_WIN)
-  if (win8::IsSingleWindowMetroMode() &&
-      browser_->profile()->HasOffTheRecordProfile()) {
-    return false;
-  }
-#endif
-
   return !browser_->profile()->IsGuestSession();
 }
 
-bool WrenchMenuModel::ShouldShowNewWindowMenuItem() {
-#if defined(OS_WIN)
-  if (!win8::IsSingleWindowMetroMode())
-    return true;
-
-  // In Win8's single window Metro mode, we only show the New Window options
-  // if there isn't already a window of the requested type (incognito or not)
-  // that is available.
-  return browser_->profile()->IsOffTheRecord() &&
-      !chrome::FindBrowserWithProfile(
-          browser_->profile()->GetOriginalProfile(),
-          browser_->host_desktop_type());
-#else
-  return true;
-#endif
-}
-
 void WrenchMenuModel::Build(bool is_new_menu) {
 #if defined(OS_WIN)
   AddItem(IDC_VIEW_INCOMPATIBILITIES,
       l10n_util::GetStringUTF16(IDS_VIEW_INCOMPATIBILITIES));
   EnumerateModulesModel* model =
       EnumerateModulesModel::GetInstance();
   if (model->modules_to_notify_about() > 0 ||
       model->confirmed_bad_modules_detected() > 0)
     AddSeparator(ui::NORMAL_SEPARATOR);
 #endif
 
   AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
-  if (ShouldShowNewWindowMenuItem())
-    AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
+  AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
 
   if (ShouldShowNewIncognitoWindowMenuItem())
     AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW, IDS_NEW_INCOGNITO_WINDOW);
 
 #if defined(OS_WIN) && !defined(NDEBUG) && defined(USE_ASH)
   if (base::win::GetVersion() < base::win::VERSION_WIN8 &&
       chrome::HOST_DESKTOP_TYPE_NATIVE != chrome::HOST_DESKTOP_TYPE_ASH) {
     AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP,
                         ash::Shell::HasInstance() ? IDS_CLOSE_ASH_DESKTOP :
                                                     IDS_OPEN_ASH_DESKTOP);
@@ skipping 249 matching lines @@
             &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 void WrenchMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }