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

Unified Diff: ash/wm/workspace/workspace_layout_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 | « ash/root_window_controller_unittest.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index 84a22519cd4273eb8099660be50b49ca446a7f11..63826fcad56f7afda82b907cccba4f45dbb0d716 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -29,8 +29,6 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/ime/dummy_text_input_client.h"
#include "ui/base/ime/input_method.h"
-#include "ui/base/ime/text_input_focus_manager.h"
-#include "ui/base/ui_base_switches_util.h"
#include "ui/base/ui_base_types.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/screen.h"
@@ -1014,27 +1012,17 @@ class WorkspaceLayoutManagerKeyboardTest : public test::AshTestBase {
}
void Focus(ui::TextInputClient* text_input_client) {
- if (switches::IsTextInputFocusManagerEnabled()) {
- ui::TextInputFocusManager::GetInstance()->FocusTextInputClient(
- text_input_client);
- } else {
- aura::Window* root_window =
- ash::Shell::GetInstance()->GetPrimaryRootWindow();
- ui::InputMethod* input_method = root_window->GetHost()->GetInputMethod();
- input_method->SetFocusedTextInputClient(text_input_client);
- }
+ aura::Window* root_window =
+ ash::Shell::GetInstance()->GetPrimaryRootWindow();
+ ui::InputMethod* input_method = root_window->GetHost()->GetInputMethod();
+ input_method->SetFocusedTextInputClient(text_input_client);
}
void Blur(ui::TextInputClient* text_input_client) {
- if (switches::IsTextInputFocusManagerEnabled()) {
- ui::TextInputFocusManager::GetInstance()->BlurTextInputClient(
- text_input_client);
- } else {
- aura::Window* root_window =
- ash::Shell::GetInstance()->GetPrimaryRootWindow();
- ui::InputMethod* input_method = root_window->GetHost()->GetInputMethod();
- input_method->SetFocusedTextInputClient(NULL);
- }
+ aura::Window* root_window =
+ ash::Shell::GetInstance()->GetPrimaryRootWindow();
+ ui::InputMethod* input_method = root_window->GetHost()->GetInputMethod();
+ input_method->SetFocusedTextInputClient(NULL);
}
private:
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698