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

Unified Diff: ui/views/focus/focus_manager_unittest.cc

Issue 1182523003: Removes TextInputFocusManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit per comment. Created 5 years, 6 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/focus/focus_manager.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/focus/focus_manager_unittest.cc
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index 007d9fc88ebd6805937eb2f777ff805a62b0f8a5..5789c5ec21df9c608abc954713081e40e97e8ae7 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -12,9 +12,6 @@
#include "ui/aura/client/focus_client.h"
#include "ui/aura/window.h"
#include "ui/base/accelerators/accelerator.h"
-#include "ui/base/ime/dummy_text_input_client.h"
-#include "ui/base/ime/text_input_focus_manager.h"
-#include "ui/base/ui_base_switches.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/views/accessible_pane_view.h"
#include "ui/views/controls/button/label_button.h"
@@ -796,60 +793,6 @@ TEST_F(FocusManagerTest, StoreFocusedView) {
EXPECT_EQ(&view, GetFocusManager()->GetStoredFocusView());
}
-class TextInputTestView : public View {
- public:
- TextInputTestView() {}
-
- ui::TextInputClient* GetTextInputClient() override {
- return &text_input_client_;
- }
-
- private:
- ui::DummyTextInputClient text_input_client_;
-
- DISALLOW_COPY_AND_ASSIGN(TextInputTestView);
-};
-
-TEST_F(FocusManagerTest, TextInputClient) {
- base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
- cmd_line->AppendSwitch(switches::kEnableTextInputFocusManager);
-
- View* view = new TextInputTestView;
- ui::TextInputClient* text_input_client = view->GetTextInputClient();
- view->SetFocusable(true);
- GetContentsView()->AddChildView(view);
- ui::TextInputFocusManager* text_input_focus_manager =
- ui::TextInputFocusManager::GetInstance();
-
- GetFocusManager()->SetFocusedView(view);
- EXPECT_EQ(view, GetFocusManager()->GetFocusedView());
- EXPECT_EQ(text_input_client,
- text_input_focus_manager->GetFocusedTextInputClient());
- GetFocusManager()->StoreFocusedView(false);
- EXPECT_TRUE(GetFocusManager()->RestoreFocusedView());
- EXPECT_EQ(text_input_client,
- text_input_focus_manager->GetFocusedTextInputClient());
-
- // Repeat with |true|.
- GetFocusManager()->SetFocusedView(view);
- EXPECT_EQ(view, GetFocusManager()->GetFocusedView());
- EXPECT_EQ(text_input_client,
- text_input_focus_manager->GetFocusedTextInputClient());
- GetFocusManager()->StoreFocusedView(true);
- EXPECT_TRUE(GetFocusManager()->RestoreFocusedView());
- EXPECT_EQ(text_input_client,
- text_input_focus_manager->GetFocusedTextInputClient());
-
- // Focus the view twice in a row.
- GetFocusManager()->SetFocusedView(view);
- EXPECT_EQ(text_input_client,
- text_input_focus_manager->GetFocusedTextInputClient());
- ui::TextInputFocusManager::GetInstance()->FocusTextInputClient(NULL);
- GetFocusManager()->SetFocusedView(view);
- EXPECT_EQ(text_input_client,
- text_input_focus_manager->GetFocusedTextInputClient());
-}
-
namespace {
// Trivial WidgetDelegate implementation that allows setting return value of
« no previous file with comments | « ui/views/focus/focus_manager.cc ('k') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698