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

Unified Diff: content/browser/renderer_host/native_web_keyboard_event_aura.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
Index: content/browser/renderer_host/native_web_keyboard_event_aura.cc
===================================================================
--- content/browser/renderer_host/native_web_keyboard_event_aura.cc (revision 150582)
+++ content/browser/renderer_host/native_web_keyboard_event_aura.cc (working copy)
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "content/browser/renderer_host/web_input_event_aura.h"
-#include "ui/aura/event.h"
+#include "ui/base/event.h"
namespace {
@@ -14,8 +14,8 @@
// queued in RenderWidgetHost and may be passed and used
// RenderViewHostDelegate::HandledKeybardEvent after the original aura
// event is destroyed.
-aura::Event* CopyEvent(aura::Event* event) {
- return event ? static_cast<aura::KeyEvent*>(event)->Copy() : NULL;
+ui::Event* CopyEvent(ui::Event* event) {
+ return event ? static_cast<ui::KeyEvent*>(event)->Copy() : NULL;
}
int EventFlagsToWebInputEventModifiers(int flags) {
@@ -39,7 +39,7 @@
NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event)
: WebKeyboardEvent(content::MakeWebKeyboardEvent(
- static_cast<aura::KeyEvent*>(native_event))),
+ static_cast<ui::KeyEvent*>(native_event))),
os_event(CopyEvent(native_event)),
skip_in_browser(false) {
}
« no previous file with comments | « chrome/browser/ui/views/toolbar_view.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698