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

Unified Diff: ui/aura/shared/input_method_event_filter.h

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 | « ui/aura/shared/compound_event_filter_unittest.cc ('k') | ui/aura/shared/input_method_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/shared/input_method_event_filter.h
===================================================================
--- ui/aura/shared/input_method_event_filter.h (revision 150582)
+++ ui/aura/shared/input_method_event_filter.h (working copy)
@@ -24,26 +24,25 @@
// An event filter that forwards a KeyEvent to a system IME, and dispatches a
// TranslatedKeyEvent to the root window as needed.
class AURA_EXPORT InputMethodEventFilter
- : public aura::EventFilter,
+ : public EventFilter,
public ui::internal::InputMethodDelegate {
public:
InputMethodEventFilter();
virtual ~InputMethodEventFilter();
- void SetInputMethodPropertyInRootWindow(aura::RootWindow* root_window);
+ void SetInputMethodPropertyInRootWindow(RootWindow* root_window);
private:
- // Overridden from aura::EventFilter:
- virtual bool PreHandleKeyEvent(aura::Window* target,
- aura::KeyEvent* event) OVERRIDE;
- virtual bool PreHandleMouseEvent(aura::Window* target,
- aura::MouseEvent* event) OVERRIDE;
+ // Overridden from EventFilter:
+ virtual bool PreHandleKeyEvent(Window* target, ui::KeyEvent* event) OVERRIDE;
+ virtual bool PreHandleMouseEvent(Window* target,
+ ui::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(
- aura::Window* target,
- aura::TouchEvent* event) OVERRIDE;
+ Window* target,
+ ui::TouchEventImpl* event) OVERRIDE;
virtual ui::GestureStatus PreHandleGestureEvent(
- aura::Window* target,
- aura::GestureEvent* event) OVERRIDE;
+ Window* target,
+ ui::GestureEventImpl* event) OVERRIDE;
// Overridden from ui::internal::InputMethodDelegate.
virtual void DispatchKeyEventPostIME(const base::NativeEvent& event) OVERRIDE;
« no previous file with comments | « ui/aura/shared/compound_event_filter_unittest.cc ('k') | ui/aura/shared/input_method_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698