diff options
| author | ankit2.kumar@samsung.com <ankit2.kumar@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 23:03:41 +0000 |
|---|---|---|
| committer | ankit2.kumar@samsung.com <ankit2.kumar@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-08 23:03:41 +0000 |
| commit | 8ae52554c065f574e3f8d2520c155c72d5412f04 (patch) | |
| tree | 9a3c038e2898967c5f119f6a9d17ab4f164f8613 | |
| parent | d7b975a696e5361e0dd46a20eceecb854162f037 (diff) | |
| download | chromium_src-8ae52554c065f574e3f8d2520c155c72d5412f04.zip chromium_src-8ae52554c065f574e3f8d2520c155c72d5412f04.tar.gz chromium_src-8ae52554c065f574e3f8d2520c155c72d5412f04.tar.bz2 | |
Added code to disable 'paste' if nothing is present in clipboard to paste.
On right click in editable node context menu was always having 'paste'
option as enabled. Added check that if clipboard is not empty
then only show 'paste' option.
BUG=396616
Review URL: https://codereview.chromium.org/443073002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288461 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/renderer_context_menu/render_view_context_menu.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index 2d61b52..c0ef40b 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -1181,9 +1181,13 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) const { return !!(params_.edit_flags & WebContextMenuData::CanCopy); case IDC_CONTENT_CONTEXT_PASTE: - case IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE: - return !!(params_.edit_flags & WebContextMenuData::CanPaste); - + case IDC_CONTENT_CONTEXT_PASTE_AND_MATCH_STYLE: { + std::vector<base::string16> types; + bool ignore; + ui::Clipboard::GetForCurrentThread()->ReadAvailableTypes( + ui::CLIPBOARD_TYPE_COPY_PASTE, &types, &ignore); + return !types.empty(); + } case IDC_CONTENT_CONTEXT_DELETE: return !!(params_.edit_flags & WebContextMenuData::CanDelete); |