Index: ui/views/test/views_test_base.cc |
=================================================================== |
--- ui/views/test/views_test_base.cc (revision 137127) |
+++ ui/views/test/views_test_base.cc (working copy) |
@@ -15,47 +15,8 @@ |
#include "ui/aura/test/test_screen.h" |
#include "ui/aura/test/test_stacking_client.h" |
#include "ui/base/ime/input_method.h" |
+#include "ui/base/test/dummy_input_method.h" |
#include "ui/gfx/screen.h" |
- |
-namespace { |
- |
-class DummyInputMethod : public ui::InputMethod { |
- public: |
- DummyInputMethod() {} |
- virtual ~DummyInputMethod() {} |
- |
- // ui::InputMethod overrides: |
- virtual void SetDelegate( |
- ui::internal::InputMethodDelegate* delegate) OVERRIDE {} |
- virtual void Init(bool focused) OVERRIDE {} |
- virtual void OnFocus() OVERRIDE {} |
- virtual void OnBlur() OVERRIDE {} |
- virtual void SetFocusedTextInputClient( |
- ui::TextInputClient* client) OVERRIDE {} |
- virtual ui::TextInputClient* GetTextInputClient() const OVERRIDE { |
- return NULL; |
- } |
- virtual void DispatchKeyEvent( |
- const base::NativeEvent& native_key_event) OVERRIDE {} |
- virtual void OnTextInputTypeChanged( |
- const ui::TextInputClient* client) OVERRIDE {} |
- virtual void OnCaretBoundsChanged( |
- const ui::TextInputClient* client) OVERRIDE {} |
- virtual void CancelComposition(const ui::TextInputClient* client) OVERRIDE {} |
- virtual std::string GetInputLocale() OVERRIDE { return ""; } |
- virtual base::i18n::TextDirection GetInputTextDirection() OVERRIDE { |
- return base::i18n::UNKNOWN_DIRECTION; |
- } |
- virtual bool IsActive() OVERRIDE { return true; } |
- virtual ui::TextInputType GetTextInputType() const OVERRIDE { |
- return ui::TEXT_INPUT_TYPE_NONE; |
- } |
- virtual bool CanComposeInline() const OVERRIDE { |
- return true; |
- } |
-}; |
- |
-} // namespace |
#endif |
namespace views { |
@@ -64,7 +25,7 @@ |
: setup_called_(false), |
teardown_called_(false) { |
#if defined(USE_AURA) |
- test_input_method_.reset(new DummyInputMethod); |
+ test_input_method_.reset(new ui::test::DummyInputMethod); |
#endif |
} |