chrome/browser/ui/toolbar/wrench_menu_model.cc - Issue 11411286: Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11411286: Decouple IsMetroProcess() calls, introducing IsSingleWindowMetroMode(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: keep base/win/metro.h in omnibox_view_win.cc for IsTSFAwareRequired() Created 8 years 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

« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_win.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 b270dd3ddc88e6e663e858bcb3329a3fbc2fe5d3..491f7557806e1437e57cc0966000a78843d6f56c 100644

--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc

+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc

@@ -71,6 +71,7 @@

#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 "win8/util/win8_util.h"

#endif

#if defined(USE_ASH)

@@ -474,9 +475,10 @@ void WrenchMenuModel::Build(bool is_new_menu, bool supports_new_separators) {

AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);

#if defined(OS_WIN)

- if (base::win::IsMetroProcess()) {

- // In Metro, we only show the New Window options if there isn't already

- // a window of the requested type (incognito or not) that is available.

+ if (win8::IsSingleWindowMetroMode()) {

+ // 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.

if (browser_->profile()->IsOffTheRecord()) {

if (browser::FindBrowserWithProfile(

browser_->profile()->GetOriginalProfile(),