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

Unified Diff: ui/views/corewm/input_method_event_filter.h

Issue 11275139: Move ui\aura\shared to ui\views\corewm (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/corewm/compound_event_filter_unittest.cc ('k') | ui/views/corewm/input_method_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/input_method_event_filter.h
===================================================================
--- ui/views/corewm/input_method_event_filter.h (revision 167200)
+++ ui/views/corewm/input_method_event_filter.h (working copy)
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_AURA_SHARED_INPUT_METHOD_EVENT_FILTER_H_
-#define UI_AURA_SHARED_INPUT_METHOD_EVENT_FILTER_H_
+#ifndef UI_VIEWS_COREWM_INPUT_METHOD_EVENT_FILTER_H_
+#define UI_VIEWS_COREWM_INPUT_METHOD_EVENT_FILTER_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
@@ -12,38 +12,41 @@
#include "ui/base/ime/input_method_delegate.h"
#include "ui/views/views_export.h"
+namespace aura {
+class RootWindow;
+}
+
namespace ui {
class InputMethod;
}
-namespace aura {
-class RootWindow;
+namespace views {
+namespace corewm {
-namespace shared {
-
// An event filter that forwards a KeyEvent to a system IME, and dispatches a
// TranslatedKeyEvent to the root window as needed.
class VIEWS_EXPORT InputMethodEventFilter
- : public EventFilter,
+ : public aura::EventFilter,
public ui::internal::InputMethodDelegate {
public:
InputMethodEventFilter();
virtual ~InputMethodEventFilter();
- void SetInputMethodPropertyInRootWindow(RootWindow* root_window);
+ void SetInputMethodPropertyInRootWindow(aura::RootWindow* root_window);
ui::InputMethod* input_method() const { return input_method_.get(); }
private:
// Overridden from EventFilter:
- virtual bool PreHandleKeyEvent(Window* target, ui::KeyEvent* event) OVERRIDE;
- virtual bool PreHandleMouseEvent(Window* target,
+ virtual bool PreHandleKeyEvent(aura::Window* target,
+ ui::KeyEvent* event) OVERRIDE;
+ virtual bool PreHandleMouseEvent(aura::Window* target,
ui::MouseEvent* event) OVERRIDE;
virtual ui::EventResult PreHandleTouchEvent(
- Window* target,
+ aura::Window* target,
ui::TouchEvent* event) OVERRIDE;
virtual ui::EventResult PreHandleGestureEvent(
- Window* target,
+ aura::Window* target,
ui::GestureEvent* event) OVERRIDE;
// Overridden from ui::internal::InputMethodDelegate.
@@ -56,12 +59,12 @@
// The target root window to which the key event translated by IME will
// be dispatched.
- RootWindow* target_root_window_;
+ aura::RootWindow* target_root_window_;
DISALLOW_COPY_AND_ASSIGN(InputMethodEventFilter);
};
-} // namespace shared
-} // namespace aura
+} // namespace corewm
+} // namespace views
-#endif // UI_AURA_IME_INPUT_METHOD_EVENT_FILTER_H_
+#endif // UI_VIEWS_COREWM_INPUT_METHOD_EVENT_FILTER_H_
« no previous file with comments | « ui/views/corewm/compound_event_filter_unittest.cc ('k') | ui/views/corewm/input_method_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698