Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3036)

Unified Diff: chrome/browser/ui/toolbar/wrench_menu_model.cc

Issue 243703003: Removes win8_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moar Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index e2ca7b5d995df26e25c0f5e6bf4d0b3c1bf37cc9..13dc11019fd981742575c1952363a01a20b0e834 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -66,7 +66,6 @@
#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)
@@ -482,33 +481,9 @@ 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,
@@ -521,8 +496,7 @@ void WrenchMenuModel::Build(bool is_new_menu) {
#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);

Powered by Google App Engine
This is Rietveld 408576698