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

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

Issue 10967043: Add ability to open/close ash desktop via hot dogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ToT Created 8 years, 3 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/browser_command_controller.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
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 62ddc5c02859b6f04378d5d86fde2f90cac36ec9..a925c1fda190693ea7e6e0311a3620d075502304 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -70,6 +70,10 @@
#include "chrome/browser/enumerate_modules_model_win.h"
#endif
+#if defined(USE_ASH)
+#include "ash/shell.h"
+#endif
+
using content::HostZoomMap;
using content::UserMetricsAction;
using content::WebContents;
@@ -497,6 +501,15 @@ 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);
+ }
+#endif
+
bookmark_sub_menu_model_.reset(new BookmarkSubMenuModel(this, browser_));
AddSubMenuWithStringId(IDC_BOOKMARKS_MENU, IDS_BOOKMARKS_MENU,
bookmark_sub_menu_model_.get());
« no previous file with comments | « chrome/browser/ui/browser_command_controller.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698