diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 21:11:46 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 21:11:46 +0000 |
| commit | e0fd0eb241269d47365e1c3269cffff607a88bce (patch) | |
| tree | bfc121dee7c9107aa08b27ae3ed5683cbbdf8e5d /chrome/renderer/plugins | |
| parent | 11fa87c888793d1f6afc89494550ee121d601074 (diff) | |
| download | chromium_src-e0fd0eb241269d47365e1c3269cffff607a88bce.zip chromium_src-e0fd0eb241269d47365e1c3269cffff607a88bce.tar.gz chromium_src-e0fd0eb241269d47365e1c3269cffff607a88bce.tar.bz2 | |
Cancel pending custom context menu when destroying a ContextMenuClient.
BUG=156289
Review URL: https://chromiumcodereview.appspot.com/11189033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162528 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/plugins')
| -rw-r--r-- | chrome/renderer/plugins/plugin_placeholder.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc index d5eeb43..555b65f 100644 --- a/chrome/renderer/plugins/plugin_placeholder.cc +++ b/chrome/renderer/plugins/plugin_placeholder.cc @@ -246,6 +246,8 @@ PluginPlaceholder::~PluginPlaceholder() { routing_id(), placeholder_routing_id_)); } #endif + if (context_menu_request_id_) + render_view()->CancelContextMenu(context_menu_request_id_); } #if defined(ENABLE_PLUGIN_INSTALLATION) |