always handle escape in the webview

fixes brave/browser-laptop#3338 auditors: @bbondy
brave · Aug 24, 2016 · 9e2c01c · 9e2c01c · bbondy · Aug 24, 2016
1 parent 9659cbc
commit 9e2c01c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
@@ -609,8 +609,12 @@ void WebContents::HandleKeyboardEvent(
     content::WebContents* source,
     const content::NativeWebKeyboardEvent& event) {
   if (type_ == WEB_VIEW && embedder_) {
-    // Send the unhandled keyboard events back to the embedder.
-    embedder_->HandleKeyboardEvent(source, event);
+    if (event.windowsKeyCode == ui::VKEY_ESCAPE) {
+      CommonWebContentsDelegate::HandleKeyboardEvent(source, event);
+    } else {
+      // Send the unhandled keyboard events back to the embedder.
+      embedder_->HandleKeyboardEvent(source, event);
+    }
   } else {
     // Go to the default keyboard handling.
     CommonWebContentsDelegate::HandleKeyboardEvent(source, event);