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

Unified Diff: content/renderer/render_view_browsertest.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/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index bc75a42a891dbbafb82d39008c2d268ff1a64efe..414a4a9c37577f25c2bc465d945106c7ad9d4c85 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -189,7 +189,7 @@ class RenderViewImplTest : public RenderViewTest {
MSG msg1 = { NULL, WM_KEYDOWN, key_code, 0 };
#if defined(USE_AURA)
ui::KeyEvent evt1(msg1);
- NativeWebKeyboardEvent keydown_event(&evt1);
+ NativeWebKeyboardEvent keydown_event(evt1);
#else
NativeWebKeyboardEvent keydown_event(msg1);
#endif
Andre 2014/11/20 01:01:43 Should I delete these USE_AURA guards?
sadrul 2014/11/21 19:33:42 Yeah, I think you can remove the non-USE_AURA code
Andre 2014/11/22 00:09:58 Done.
@@ -198,7 +198,7 @@ class RenderViewImplTest : public RenderViewTest {
MSG msg2 = { NULL, WM_CHAR, (*output)[0], 0 };
#if defined(USE_AURA)
ui::KeyEvent evt2(msg2);
- NativeWebKeyboardEvent char_event(&evt2);
+ NativeWebKeyboardEvent char_event(evt2);
#else
NativeWebKeyboardEvent char_event(msg2);
#endif
@@ -207,7 +207,7 @@ class RenderViewImplTest : public RenderViewTest {
MSG msg3 = { NULL, WM_KEYUP, key_code, 0 };
#if defined(USE_AURA)
ui::KeyEvent evt3(msg3);
- NativeWebKeyboardEvent keyup_event(&evt3);
+ NativeWebKeyboardEvent keyup_event(evt3);
#else
NativeWebKeyboardEvent keyup_event(msg3);
#endif
@@ -225,7 +225,7 @@ class RenderViewImplTest : public RenderViewTest {
static_cast<ui::KeyboardCode>(key_code),
flags);
ui::KeyEvent event1(xevent);
- NativeWebKeyboardEvent keydown_event(&event1);
+ NativeWebKeyboardEvent keydown_event(event1);
SendNativeKeyEvent(keydown_event);
// X11 doesn't actually have native character events, but give the test
@@ -238,14 +238,14 @@ class RenderViewImplTest : public RenderViewTest {
event2.flags()));
ui::KeyEventTestApi test_event2(&event2);
test_event2.set_is_char(true);
- NativeWebKeyboardEvent char_event(&event2);
+ NativeWebKeyboardEvent char_event(event2);
SendNativeKeyEvent(char_event);
xevent.InitKeyEvent(ui::ET_KEY_RELEASED,
static_cast<ui::KeyboardCode>(key_code),
flags);
ui::KeyEvent event3(xevent);
- NativeWebKeyboardEvent keyup_event(&event3);
+ NativeWebKeyboardEvent keyup_event(event3);
SendNativeKeyEvent(keyup_event);
long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),
@@ -258,19 +258,19 @@ class RenderViewImplTest : public RenderViewTest {
ui::KeyEvent keydown_event(ui::ET_KEY_PRESSED,
static_cast<ui::KeyboardCode>(key_code),
flags);
- NativeWebKeyboardEvent keydown_web_event(&keydown_event);
+ NativeWebKeyboardEvent keydown_web_event(keydown_event);
SendNativeKeyEvent(keydown_web_event);
ui::KeyEvent char_event(keydown_event.GetCharacter(),
static_cast<ui::KeyboardCode>(key_code),
flags);
- NativeWebKeyboardEvent char_web_event(&char_event);
+ NativeWebKeyboardEvent char_web_event(char_event);
SendNativeKeyEvent(char_web_event);
ui::KeyEvent keyup_event(ui::ET_KEY_RELEASED,
static_cast<ui::KeyboardCode>(key_code),
flags);
- NativeWebKeyboardEvent keyup_web_event(&keyup_event);
+ NativeWebKeyboardEvent keyup_web_event(keyup_event);
SendNativeKeyEvent(keyup_web_event);
long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code),

Powered by Google App Engine
This is Rietveld 408576698