content: makes WebContentsDelegate::HandleKeyboardEvent() return status
This will be used to ensure events are properly updated based on whether
the delegate handles the event or not.
BUG=891489
TEST=none
Change-Id: I94fd4f8b781dbf725b7c2c6ac0d540986c24c24f
Reviewed-on: https://chromium-review.googlesource.com/c/1262404
Commit-Queue: Scott Violet <[email protected]>
Reviewed-by: James MacLean <[email protected]>
Reviewed-by: Sadrul Chowdhury <[email protected]>
Cr-Commit-Position: refs/heads/master@{#600143}diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c553ee7..b881bf4 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2232,13 +2232,12 @@
: KeyboardEventProcessingResult::NOT_HANDLED;
}
-void WebContentsImpl::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
+bool WebContentsImpl::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
if (browser_plugin_embedder_ &&
browser_plugin_embedder_->HandleKeyboardEvent(event)) {
- return;
+ return true;
}
- if (delegate_)
- delegate_->HandleKeyboardEvent(this, event);
+ return delegate_ && delegate_->HandleKeyboardEvent(this, event);
}
bool WebContentsImpl::HandleWheelEvent(
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 82c7539e..ab486b8 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -717,7 +717,7 @@
KeyboardEventProcessingResult PreHandleKeyboardEvent(
const NativeWebKeyboardEvent& event) override;
- void HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override;
+ bool HandleKeyboardEvent(const NativeWebKeyboardEvent& event) override;
bool HandleWheelEvent(const blink::WebMouseWheelEvent& event) override;
bool PreHandleGestureEvent(const blink::WebGestureEvent& event) override;
BrowserAccessibilityManager* GetRootBrowserAccessibilityManager() override;
