diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 18:10:02 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-02 18:10:02 +0000 |
| commit | 824845f187242bcbe1ef89ca28d842f4bdad00f0 (patch) | |
| tree | fc89de4f587adf4eda8abce54980bccf7c0a81d5 | |
| parent | 96612a53307874bdb240fbe1e413cde1ea43bf19 (diff) | |
| download | chromium_src-824845f187242bcbe1ef89ca28d842f4bdad00f0.zip chromium_src-824845f187242bcbe1ef89ca28d842f4bdad00f0.tar.gz chromium_src-824845f187242bcbe1ef89ca28d842f4bdad00f0.tar.bz2 | |
Merge 237616 "Remove 'Create application shortcuts...' when in A..."
> Remove 'Create application shortcuts...' when in Ash on win
>
> It's not on ChromeOS and doesn't make sense in Ash.
>
> R=msw@chromium.org
> BUG=258217
>
> Review URL: https://codereview.chromium.org/92353002
TBR=kareng@google.com, scottmg@chromium.org
Review URL: https://codereview.chromium.org/99643002
git-svn-id: svn://svn.chromium.org/chrome/branches/1700/src@238130 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/toolbar/wrench_menu_model.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 6d46988..8d82ddd 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -191,10 +191,17 @@ ToolsMenuModel::ToolsMenuModel(ui::SimpleMenuModel::Delegate* delegate, ToolsMenuModel::~ToolsMenuModel() {} void ToolsMenuModel::Build(Browser* browser) { -#if !defined(OS_CHROMEOS) && !defined(OS_MACOSX) - AddItemWithStringId(IDC_CREATE_SHORTCUTS, IDS_CREATE_SHORTCUTS); - AddSeparator(ui::NORMAL_SEPARATOR); + bool show_create_shortcuts = true; +#if defined(OS_CHROMEOS) || defined(OS_MACOSX) + show_create_shortcuts = false; +#elif defined(USE_ASH) + if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) + show_create_shortcuts = false; #endif + if (show_create_shortcuts) { + AddItemWithStringId(IDC_CREATE_SHORTCUTS, IDS_CREATE_SHORTCUTS); + AddSeparator(ui::NORMAL_SEPARATOR); + } AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS); |