summaryrefslogtreecommitdiffstats
path: root/ui/views/widget/widget_interactive_uitest.cc
diff options
context:
space:
mode:
authorshuchen <shuchen@chromium.org>2015-07-01 19:11:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-02 02:11:48 +0000
commit12f77cb7c9b7b8256df62a4423e03e539a980b3b (patch)
tree89dbfb2402ab76c5e181ba8997077577f0e85888 /ui/views/widget/widget_interactive_uitest.cc
parent85f8564bcc24eb33885a13b8048f98e32dfc4062 (diff)
downloadchromium_src-12f77cb7c9b7b8256df62a4423e03e539a980b3b.zip
chromium_src-12f77cb7c9b7b8256df62a4423e03e539a980b3b.tar.gz
chromium_src-12f77cb7c9b7b8256df62a4423e03e539a980b3b.tar.bz2
Remove the 2-level input method system & InputMethodBridge.
This is IMF refactoring according to the design: - For @google.com: https://docs.google.com/document/d/14PQN4fbbSTlJmIk6qk7RzsuNr7O22DUTfNQ6slxKWV0 - For @chromium.org: https://docs.google.com/document/d/1sDES_kuEVUjb_FwCvKsg0Ef48edq5lAx589r0qUtG4g This cl includes some fundamental changes: 1) Removed ui/views/ime/... 2) All TextInputClient's use InputMethod::SetFocusedTextInputClient() to inform InputMethod that itself is focused. 3) Supports mocking input method in InputMethodFactory for TextfieldTest. 4) Removed views::View::GetTextInputClient() which is useless. The rest changes follow the above major changes. BUG=474828 TEST=Verified locally on Win7/Win8/Linux/CrOS/Mac. Tests passed. Review URL: https://codereview.chromium.org/1177503003 Cr-Commit-Position: refs/heads/master@{#337157}
Diffstat (limited to 'ui/views/widget/widget_interactive_uitest.cc')
-rw-r--r--ui/views/widget/widget_interactive_uitest.cc38
1 files changed, 0 insertions, 38 deletions
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 35c9cef..4b5a01d 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -22,7 +22,6 @@
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/controls/textfield/textfield_test_api.h"
#include "ui/views/focus/focus_manager.h"
-#include "ui/views/ime/input_method.h"
#include "ui/views/test/focus_manager_test.h"
#include "ui/views/test/widget_test.h"
#include "ui/views/touchui/touch_selection_controller_impl.h"
@@ -1566,43 +1565,6 @@ TEST_F(WidgetInputMethodInteractiveTest, TwoWindows) {
parent->CloseNow();
}
-// Test input method focus changes affected by focus changes cross 2 top
-// windows.
-TEST_F(WidgetInputMethodInteractiveTest, TwoTopWindows) {
- Widget* widget1 = CreateWidget();
- Widget* widget2 = CreateWidget();
- Textfield* textfield1 = new Textfield;
- Textfield* textfield2 = new Textfield;
- textfield2->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
- widget1->GetRootView()->AddChildView(textfield1);
- widget2->GetRootView()->AddChildView(textfield2);
-
- // Do the initial shows synchronously. Otherwise, on X11, the window server
- // messages may be interleaved with the activation requests below.
- ShowSync(widget1);
- ShowSync(widget2);
-
- textfield1->RequestFocus();
- textfield2->RequestFocus();
-
- ActivateSync(widget1);
-
- EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT,
- widget1->GetInputMethod()->GetTextInputType());
- EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
- widget2->GetInputMethod()->GetTextInputType());
-
- ActivateSync(widget2);
-
- EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
- widget1->GetInputMethod()->GetTextInputType());
- EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD,
- widget2->GetInputMethod()->GetTextInputType());
-
- widget2->CloseNow();
- widget1->CloseNow();
-}
-
// Test input method focus changes affected by textfield's state changes.
TEST_F(WidgetInputMethodInteractiveTest, TextField) {
Widget* widget = CreateWidget();