content/browser/renderer_host/native_web_keyboard_event_mac.mm - Issue 739993002: MacViews: Fix build errors related to NativeWebKeyboardEvent

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/native_web_keyboard_event_mac.mm

Issue 739993002: MacViews: Fix build errors related to NativeWebKeyboardEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase and fix for Sadrul Created 6 years, 1 month 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/native_web_keyboard_event_aura.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/native_web_keyboard_event_mac.mm

diff --git a/content/browser/renderer_host/native_web_keyboard_event_mac.mm b/content/browser/renderer_host/native_web_keyboard_event_mac.mm

index fea2939f2c1b5f799eb84f12f82a5d25f00b51e9..76c5c1006bfcda2dad993fb71de54de13a7f08ec 100644

--- a/content/browser/renderer_host/native_web_keyboard_event_mac.mm

+++ b/content/browser/renderer_host/native_web_keyboard_event_mac.mm

@@ -7,6 +7,7 @@

#import <AppKit/AppKit.h>

#include "third_party/WebKit/public/web/mac/WebInputEventFactory.h"

+#include "ui/events/event.h"

using blink::WebInputEventFactory;

@@ -23,14 +24,8 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event)

skip_in_browser(false) {

}

-NativeWebKeyboardEvent::NativeWebKeyboardEvent(wchar_t character,

- int modifiers,

- double time_stamp_seconds)

- : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(character,

- modifiers,

- time_stamp_seconds)),

- os_event(NULL),

- skip_in_browser(false) {

+NativeWebKeyboardEvent::NativeWebKeyboardEvent(const ui::KeyEvent& key_event)

+ : NativeWebKeyboardEvent(key_event.native_event()) {

}

NativeWebKeyboardEvent::NativeWebKeyboardEvent(