Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1274)

Unified Diff: content/browser/renderer_host/native_web_keyboard_event_aura.cc

Issue 739993002: MacViews: Fix build errors related to NativeWebKeyboardEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/browser/renderer_host/native_web_keyboard_event_aura.cc
diff --git a/content/browser/renderer_host/native_web_keyboard_event_aura.cc b/content/browser/renderer_host/native_web_keyboard_event_aura.cc
index 8757b9be94379f1f6683bbd29a5c11c678d04ec5..2b3545c424bb3fe045186784e30db84c2086eccb 100644
--- a/content/browser/renderer_host/native_web_keyboard_event_aura.cc
+++ b/content/browser/renderer_host/native_web_keyboard_event_aura.cc
@@ -14,8 +14,9 @@ namespace {
// queued in RenderWidgetHost and may be passed and used
// RenderViewHostDelegate::HandledKeybardEvent after the original aura
// event is destroyed.
-ui::Event* CopyEvent(ui::Event* event) {
- return event ? new ui::KeyEvent(*static_cast<ui::KeyEvent*>(event)) : NULL;
+ui::Event* CopyEvent(const ui::Event* event) {
+ return event ? new ui::KeyEvent(*static_cast<const ui::KeyEvent*>(event))
+ : NULL;
}
int EventFlagsToWebInputEventModifiers(int flags) {
@@ -39,9 +40,12 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent()
}
NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event)
- : WebKeyboardEvent(MakeWebKeyboardEvent(
- static_cast<ui::KeyEvent*>(native_event))),
- os_event(CopyEvent(native_event)),
+ : NativeWebKeyboardEvent(static_cast<ui::KeyEvent&>(*native_event)) {
+}
+
+NativeWebKeyboardEvent::NativeWebKeyboardEvent(const ui::KeyEvent& key_event)
+ : WebKeyboardEvent(MakeWebKeyboardEvent(&key_event)),
+ os_event(CopyEvent(&key_event)),
skip_in_browser(false),
match_edit_command(false) {
}

Powered by Google App Engine
This is Rietveld 408576698