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

Unified Diff: ui/views/test/views_test_base.cc

Issue 10378043: Allow the RWHVW to be focused when a window is restored from minimized. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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/views/accessible_pane_view_unittest.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
}
« no previous file with comments | « ui/views/accessible_pane_view_unittest.cc ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698