diff options
| author | lfg@chromium.org <lfg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 16:34:49 +0000 |
|---|---|---|
| committer | lfg@chromium.org <lfg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 16:36:42 +0000 |
| commit | c5e080b8e02abdf1d04fffd191a139c641520f8f (patch) | |
| tree | e802ccab1d2b47ceaae8df55dbc522e1c14fa114 /content/browser/browser_plugin/browser_plugin_embedder.cc | |
| parent | 76e9211f9dfcd6355643b8849015055a8bb54975 (diff) | |
| download | chromium_src-c5e080b8e02abdf1d04fffd191a139c641520f8f.zip chromium_src-c5e080b8e02abdf1d04fffd191a139c641520f8f.tar.gz chromium_src-c5e080b8e02abdf1d04fffd191a139c641520f8f.tar.bz2 | |
Make sure there are no modifiers when escape is pressed.
BUG=401644
Review URL: https://codereview.chromium.org/496873005
Cr-Commit-Position: refs/heads/master@{#291429}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_plugin/browser_plugin_embedder.cc')
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_embedder.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc index 6c94099..f02d315 100644 --- a/content/browser/browser_plugin/browser_plugin_embedder.cc +++ b/content/browser/browser_plugin/browser_plugin_embedder.cc @@ -157,8 +157,10 @@ void BrowserPluginEmbedder::OnAttach( bool BrowserPluginEmbedder::HandleKeyboardEvent( const NativeWebKeyboardEvent& event) { - if (event.windowsKeyCode != ui::VKEY_ESCAPE) + if ((event.windowsKeyCode != ui::VKEY_ESCAPE) || + (event.modifiers & blink::WebInputEvent::InputModifiers)) { return false; + } bool event_consumed = false; GetBrowserPluginGuestManager()->ForEachGuest( |