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

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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/web_contents/web_contents_view_aura.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
===================================================================
--- content/renderer/render_view_browsertest.cc (revision 150582)
+++ content/renderer/render_view_browsertest.cc (working copy)
@@ -40,7 +40,7 @@
#endif
#if defined(USE_AURA)
-#include "ui/aura/event.h"
+#include "ui/base/event.h"
#endif
#if defined(USE_AURA) && defined(USE_X11)
@@ -176,7 +176,7 @@
// WM_CHAR sends a composed Unicode character.
MSG msg1 = { NULL, WM_KEYDOWN, key_code, 0 };
#if defined(USE_AURA)
- aura::KeyEvent evt1(msg1, false);
+ ui::KeyEvent evt1(msg1, false);
NativeWebKeyboardEvent keydown_event(&evt1);
#else
NativeWebKeyboardEvent keydown_event(msg1);
@@ -185,7 +185,7 @@
MSG msg2 = { NULL, WM_CHAR, (*output)[0], 0 };
#if defined(USE_AURA)
- aura::KeyEvent evt2(msg2, true);
+ ui::KeyEvent evt2(msg2, true);
NativeWebKeyboardEvent char_event(&evt2);
#else
NativeWebKeyboardEvent char_event(msg2);
@@ -194,7 +194,7 @@
MSG msg3 = { NULL, WM_KEYUP, key_code, 0 };
#if defined(USE_AURA)
- aura::KeyEvent evt3(msg3, false);
+ ui::KeyEvent evt3(msg3, false);
NativeWebKeyboardEvent keyup_event(&evt3);
#else
NativeWebKeyboardEvent keyup_event(msg3);
@@ -213,7 +213,7 @@
static_cast<ui::KeyboardCode>(key_code),
flags,
&xevent1);
- aura::KeyEvent event1(&xevent1, false);
+ ui::KeyEvent event1(&xevent1, false);
NativeWebKeyboardEvent keydown_event(&event1);
SendNativeKeyEvent(keydown_event);
@@ -222,7 +222,7 @@
static_cast<ui::KeyboardCode>(key_code),
flags,
&xevent2);
- aura::KeyEvent event2(&xevent2, true);
+ ui::KeyEvent event2(&xevent2, true);
NativeWebKeyboardEvent char_event(&event2);
SendNativeKeyEvent(char_event);
@@ -231,7 +231,7 @@
static_cast<ui::KeyboardCode>(key_code),
flags,
&xevent3);
- aura::KeyEvent event3(&xevent3, false);
+ ui::KeyEvent event3(&xevent3, false);
NativeWebKeyboardEvent keyup_event(&event3);
SendNativeKeyEvent(keyup_event);
« no previous file with comments | « content/browser/web_contents/web_contents_view_aura.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698