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

Issues Search
    My Issues | Starred     Open | Closed | All

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: remove unrelated change 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/host_desktop.cc ('k') | chrome/browser/ui/views/accelerator_table.cc » ('j') | chrome/browser/ui/views/chrome_views_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 6187af4740691b8ba05c0e2efc4edda81dce0dd2..30ce901b9c71033d79db77d88a3a83ee1c023339 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -501,13 +501,11 @@ 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 defined(USE_AURA)
+ 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') | chrome/browser/ui/views/chrome_views_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698