content/browser/renderer_host/input/web_input_event_builders_mac.mm - Issue 2234023002: Refactor WebInputEventAura to ui/events/blink

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/input/web_input_event_builders_mac.mm

Issue 2234023002: Refactor WebInputEventAura to ui/events/blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/input/web_input_event_builders_android.cc ('k') | content/browser/renderer_host/input/web_input_event_builders_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/input/web_input_event_builders_mac.mm

diff --git a/content/browser/renderer_host/input/web_input_event_builders_mac.mm b/content/browser/renderer_host/input/web_input_event_builders_mac.mm

index 91b761d1ced1467c53cea560cc589ee15af69378..3c9874b4ed67bcc944c33fe8a125fd6c47c6d9c8 100644

--- a/content/browser/renderer_host/input/web_input_event_builders_mac.mm

+++ b/content/browser/renderer_host/input/web_input_event_builders_mac.mm

@@ -37,9 +37,9 @@

#include "base/mac/sdk_forward_declarations.h"

#include "base/strings/string_util.h"

-#include "content/browser/renderer_host/input/web_input_event_util.h"

#include "third_party/WebKit/public/web/WebInputEvent.h"

#include "ui/base/cocoa/cocoa_base_utils.h"

+#include "ui/events/blink/blink_event_util.h"

#import "ui/events/cocoa/cocoa_event_utils.h"

#include "ui/events/keycodes/keyboard_code_conversion.h"

#include "ui/events/keycodes/keyboard_code_conversion_mac.h"

@@ -287,7 +287,7 @@ blink::WebKeyboardEvent WebKeyboardEventBuilder::Build(NSEvent* event) {

ui::DomCode dom_code = ui::DomCodeFromNSEvent(event);

result.windowsKeyCode =

ui::LocatedToNonLocatedKeyboardCode(ui::KeyboardCodeFromNSEvent(event));

- result.modifiers |= DomCodeToWebInputEventModifiers(dom_code);

+ result.modifiers |= ui::DomCodeToWebInputEventModifiers(dom_code);

result.nativeKeyCode = [event keyCode];

result.domCode = static_cast<int>(dom_code);

result.domKey = DomKeyFromEvent(event);