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

Side by Side Diff: ui/aura/shared/input_method_event_filter.h

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_AURA_SHARED_INPUT_METHOD_EVENT_FILTER_H_ 5 #ifndef UI_AURA_SHARED_INPUT_METHOD_EVENT_FILTER_H_
6 #define UI_AURA_SHARED_INPUT_METHOD_EVENT_FILTER_H_ 6 #define UI_AURA_SHARED_INPUT_METHOD_EVENT_FILTER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 21 matching lines...) Expand all
32 32
33 void SetInputMethodPropertyInRootWindow(RootWindow* root_window); 33 void SetInputMethodPropertyInRootWindow(RootWindow* root_window);
34 34
35 ui::InputMethod* input_method() const { return input_method_.get(); } 35 ui::InputMethod* input_method() const { return input_method_.get(); }
36 36
37 private: 37 private:
38 // Overridden from EventFilter: 38 // Overridden from EventFilter:
39 virtual bool PreHandleKeyEvent(Window* target, ui::KeyEvent* event) OVERRIDE; 39 virtual bool PreHandleKeyEvent(Window* target, ui::KeyEvent* event) OVERRIDE;
40 virtual bool PreHandleMouseEvent(Window* target, 40 virtual bool PreHandleMouseEvent(Window* target,
41 ui::MouseEvent* event) OVERRIDE; 41 ui::MouseEvent* event) OVERRIDE;
42 virtual ui::TouchStatus PreHandleTouchEvent( 42 virtual ui::EventResult PreHandleTouchEvent(
43 Window* target, 43 Window* target,
44 ui::TouchEvent* event) OVERRIDE; 44 ui::TouchEvent* event) OVERRIDE;
45 virtual ui::EventResult PreHandleGestureEvent( 45 virtual ui::EventResult PreHandleGestureEvent(
46 Window* target, 46 Window* target,
47 ui::GestureEvent* event) OVERRIDE; 47 ui::GestureEvent* event) OVERRIDE;
48 48
49 // Overridden from ui::internal::InputMethodDelegate. 49 // Overridden from ui::internal::InputMethodDelegate.
50 virtual void DispatchKeyEventPostIME(const base::NativeEvent& event) OVERRIDE; 50 virtual void DispatchKeyEventPostIME(const base::NativeEvent& event) OVERRIDE;
51 virtual void DispatchFabricatedKeyEventPostIME(ui::EventType type, 51 virtual void DispatchFabricatedKeyEventPostIME(ui::EventType type,
52 ui::KeyboardCode key_code, 52 ui::KeyboardCode key_code,
53 int flags) OVERRIDE; 53 int flags) OVERRIDE;
54 54
55 scoped_ptr<ui::InputMethod> input_method_; 55 scoped_ptr<ui::InputMethod> input_method_;
56 56
57 // The target root window to which the key event translated by IME will 57 // The target root window to which the key event translated by IME will
58 // be dispatched. 58 // be dispatched.
59 RootWindow* target_root_window_; 59 RootWindow* target_root_window_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(InputMethodEventFilter); 61 DISALLOW_COPY_AND_ASSIGN(InputMethodEventFilter);
62 }; 62 };
63 63
64 } // namespace shared 64 } // namespace shared
65 } // namespace aura 65 } // namespace aura
66 66
67 #endif // UI_AURA_IME_INPUT_METHOD_EVENT_FILTER_H_ 67 #endif // UI_AURA_IME_INPUT_METHOD_EVENT_FILTER_H_
OLDNEW
« 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