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

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <tuple>
@@ skipping 37 matching lines @@
 #include "content/browser/renderer_host/render_widget_host_view_event_handler.h"
 #include "content/browser/renderer_host/render_widget_host_view_frame_subscriber.h"
 #include "content/browser/renderer_host/resize_lock.h"
 #include "content/browser/renderer_host/text_input_manager.h"
 #include "content/browser/web_contents/web_contents_view_aura.h"
 #include "content/common/host_shared_bitmap_manager.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/common/input_messages.h"
 #include "content/common/text_input_state.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/keyboard_event_processing_result.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents_view_delegate.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_test_sink.h"
@@ skipping 135 matching lines @@
     return !!focused_widget_ ? focused_widget_ : widget_host;
   }
   void set_focused_widget(RenderWidgetHostImpl* focused_widget) {
     focused_widget_ = focused_widget;
   }
 
   double get_last_device_scale_factor() { return last_device_scale_factor_; }
   void UpdateDeviceScaleFactor(double device_scale_factor) override {
     last_device_scale_factor_ = device_scale_factor;
   }
+  void set_pre_handle_keyboard_event_result(
+      KeyboardEventProcessingResult result) {
+    pre_handle_keyboard_event_result_ = result;
+  }
 
  protected:
   // RenderWidgetHostDelegate:
-  bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
-                              bool* is_keyboard_shortcut) override {
+  KeyboardEventProcessingResult PreHandleKeyboardEvent(
+      const NativeWebKeyboardEvent& event) override {
     last_event_.reset(new NativeWebKeyboardEvent(event));
-    return true;
+    return pre_handle_keyboard_event_result_;
   }
   void Cut() override {}
   void Copy() override {}
   void Paste() override {}
   void SelectAll() override {}
   void SendScreenRects() override {
     if (rwh_)
       rwh_->SendScreenRects();
   }
   bool IsFullscreenForCurrentTab() const override { return is_fullscreen_; }
 
  private:
   std::unique_ptr<NativeWebKeyboardEvent> last_event_;
   RenderWidgetHostImpl* rwh_;
   bool is_fullscreen_;
   TextInputManager text_input_manager_;
   RenderWidgetHostImpl* focused_widget_;
   double last_device_scale_factor_;
+  KeyboardEventProcessingResult pre_handle_keyboard_event_result_ =
+      KeyboardEventProcessingResult::HANDLED;
 
   DISALLOW_COPY_AND_ASSIGN(MockRenderWidgetHostDelegate);
 };
 
 // Simple observer that keeps track of changes to a window for tests.
 class TestWindowObserver : public aura::WindowObserver {
  public:
   explicit TestWindowObserver(aura::Window* window_to_observe)
       : window_(window_to_observe) {
     window_->AddObserver(this);
@@ skipping 4014 matching lines @@
 // Checks key event codes.
 TEST_F(RenderWidgetHostViewAuraTest, KeyEvent) {
   view_->InitAsChild(nullptr);
   view_->Show();
 
   ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::DomCode::US_A,
                          ui::EF_NONE);
   view_->OnKeyEvent(&key_event);
 
   const NativeWebKeyboardEvent* event = delegates_.back()->last_event();
-  EXPECT_NE(nullptr, event);
-  if (event) {
-    EXPECT_EQ(key_event.key_code(), event->windowsKeyCode);
-    EXPECT_EQ(ui::KeycodeConverter::DomCodeToNativeKeycode(key_event.code()),
-              event->nativeKeyCode);
-  }
+  ASSERT_TRUE(event);
+  EXPECT_EQ(key_event.key_code(), event->windowsKeyCode);
+  EXPECT_EQ(ui::KeycodeConverter::DomCodeToNativeKeycode(key_event.code()),
+            event->nativeKeyCode);
+}
+
+TEST_F(RenderWidgetHostViewAuraTest, KeyEventsHandled) {
+  view_->InitAsChild(nullptr);
+  view_->Show();
+
+  ui::KeyEvent key_event1(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
+  view_->OnKeyEvent(&key_event1);
+  // Normally event should be handled.
+  EXPECT_TRUE(key_event1.handled());
+
+  ASSERT_FALSE(delegates_.empty());
+  // Make the delegate mark the event as not-handled.
+  delegates_.back()->set_pre_handle_keyboard_event_result(
+      KeyboardEventProcessingResult::HANDLED_DONT_UPDATE_EVENT);
+  ui::KeyEvent key_event2(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE);
+  view_->OnKeyEvent(&key_event2);
+  EXPECT_FALSE(key_event2.handled());
 }
 
 TEST_F(RenderWidgetHostViewAuraTest, SetCanScrollForWebMouseWheelEvent) {
   view_->InitAsChild(nullptr);
   view_->Show();
 
   sink_->ClearMessages();
 
   // Simulates the mouse wheel event with ctrl modifier applied.
   ui::MouseWheelEvent event(gfx::Vector2d(1, 1), gfx::Point(), gfx::Point(),
@@ skipping 719 matching lines @@
     // There is no composition in the beginning.
     EXPECT_FALSE(has_composition_text());
     SetHasCompositionTextToTrue();
     view->ImeCancelComposition();
     // The composition must have been canceled.
     EXPECT_FALSE(has_composition_text());
   }
 }
 
 }  // namespace content