| 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());
|
|
|