diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-25 19:46:58 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-25 19:46:58 +0000 |
| commit | 82b3f69db170c0dac0e912f476aabddc45cbdaaa (patch) | |
| tree | e4f14fb909d6a633b875d3fd2d5ee1a877864e2e /content | |
| parent | 9020604cd1dfcdfac7ea8d38a4f000417a91f40c (diff) | |
| download | chromium_src-82b3f69db170c0dac0e912f476aabddc45cbdaaa.zip chromium_src-82b3f69db170c0dac0e912f476aabddc45cbdaaa.tar.gz chromium_src-82b3f69db170c0dac0e912f476aabddc45cbdaaa.tar.bz2 | |
Merge 178768 > browser-plugin: Disable drag-n-drop in guests.
>
> BUG=165206
>
> Review URL: https://codereview.chromium.org/12039080
TBR=sadrul@chromium.org
Review URL: https://codereview.chromium.org/12047121
git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@178873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_guest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index c8f5116..4c7ccda 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "content/browser/browser_plugin/browser_plugin_embedder.h" #include "content/browser/browser_plugin/browser_plugin_guest_helper.h" #include "content/browser/browser_plugin/browser_plugin_host_factory.h" @@ -608,6 +609,13 @@ void BrowserPluginGuest::DidCommitProvisionalLoadForFrame( } void BrowserPluginGuest::DidStopLoading(RenderViewHost* render_view_host) { + // Initiating a drag from inside a guest is currently not supported. So inject + // some JS to disable it. http://crbug.com/161112 + const char script[] = "window.addEventListener('dragstart', function() { " + " window.event.preventDefault(); " + "});"; + render_view_host->ExecuteJavascriptInWebFrame(string16(), + ASCIIToUTF16(script)); SendMessageToEmbedder(new BrowserPluginMsg_LoadStop(embedder_routing_id(), instance_id())); } |