Adds the ability for WebContentsDelegate to decide if event should be updated

content/browser/renderer_host/render_widget_host_impl.cc

Index: content/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 9914db5ce83b44decb9fab14cf8324256ae85c9c..3f48dfae5f588235fbfc824244728ed25a7cb7e5 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -64,6 +64,7 @@
 #include "content/common/text_input_state.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/keyboard_event_processing_result.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ -1166,12 +1167,13 @@ void RenderWidgetHostImpl::ForwardTouchEventWithLatencyInfo(
 
 void RenderWidgetHostImpl::ForwardKeyboardEvent(
     const NativeWebKeyboardEvent& key_event) {
-  ForwardKeyboardEventWithCommands(key_event, nullptr);
+  ForwardKeyboardEventWithCommands(key_event, nullptr, nullptr);
 }
 
 void RenderWidgetHostImpl::ForwardKeyboardEventWithCommands(
     const NativeWebKeyboardEvent& key_event,
-    const std::vector<EditCommand>* commands) {
+    const std::vector<EditCommand>* commands,
+    bool* update_event) {
   TRACE_EVENT0("input", "RenderWidgetHostImpl::ForwardKeyboardEvent");
   if (owner_delegate_ &&
       !owner_delegate_->MayRenderWidgetForwardKeyboardEvent(key_event)) {
@@ -1216,7 +1218,7 @@ void RenderWidgetHostImpl::ForwardKeyboardEventWithCommands(
   // Only pre-handle the key event if it's not handled by the input method.
   if (delegate_ && !key_event.skip_in_browser) {
     // We need to set |suppress_events_until_keydown_| to true if
-    // PreHandleKeyboardEvent() returns true, but |this| may already be
+    // PreHandleKeyboardEvent() handles the event, but |this| may already be
     // destroyed at that time. So set |suppress_events_until_keydown_| true
     // here, then revert it afterwards when necessary.
     if (key_event.type() == WebKeyboardEvent::RawKeyDown)
@@ -1224,8 +1226,21 @@ void RenderWidgetHostImpl::ForwardKeyboardEventWithCommands(
 
     // Tab switching/closing accelerators aren't sent to the renderer to avoid
     // a hung/malicious renderer from interfering.
-    if (delegate_->PreHandleKeyboardEvent(key_event, &is_shortcut))
-      return;
+    switch (delegate_->PreHandleKeyboardEvent(key_event)) {
+      case KeyboardEventProcessingResult::HANDLED:
+        return;
+#if defined(USE_AURA)
+      case KeyboardEventProcessingResult::HANDLED_DONT_UPDATE_EVENT:
+        if (update_event)
+          *update_event = false;
+        return;
+#endif
+      case KeyboardEventProcessingResult::NOT_HANDLED:
+        break;
+      case KeyboardEventProcessingResult::NOT_HANDLED_IS_SHORTCUT:
+        is_shortcut = true;
+        break;
+    }
 
     if (key_event.type() == WebKeyboardEvent::RawKeyDown)
       suppress_events_until_keydown_ = false;