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: merge up to r170746 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

« chrome/browser/ui/extensions/application_launch.cc ('K') | « chrome/browser/ui/startup/startup_browser_creator_win.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views_win.cc » ('j') | chrome/browser/ui/views/frame/browser_view.cc » ('J')
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..36de0ed5c117ef423d5b4647328e038302ec3fca 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,7 +475,7 @@ 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()) {

+ if (win8::IsSingleWindowMetroMode()) {

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

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

gab 2012/12/04 00:19:06 Done.

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

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