chrome/browser/ui/toolbar/wrench_menu_model.cc - Issue 11146023: Work on separate browser contexts

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 11146023: Work on separate browser contexts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: another busted command line flag Created 8 years, 2 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:

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 6187af4740691b8ba05c0e2efc4edda81dce0dd2..0fbd3d8136ef15046eece2473b159e9d03883420 100644

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

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

@@ -502,12 +502,10 @@ void WrenchMenuModel::Build() {

#endif // else of defined(OS_WIN)

#if defined(USE_ASH)

- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAsh)) {

- if (!ash::Shell::HasInstance())

- AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP, IDS_OPEN_ASH_DESKTOP);

- else

- AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP, IDS_CLOSE_ASH_DESKTOP);

- }

+ if (!ash::Shell::HasInstance())

+ AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP, IDS_OPEN_ASH_DESKTOP);

+ else

+ AddItemWithStringId(IDC_TOGGLE_ASH_DESKTOP, IDS_CLOSE_ASH_DESKTOP);

#endif

bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_));

« no previous file with comments | « chrome/browser/ui/host_desktop.cc ('k') | chrome/browser/ui/views/accelerator_table.cc » ('j') | no next file with comments »