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

Unified Diff: ui/wm/core/focus_controller.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/widget/widget.cc ('k') | ui/wm/core/focus_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/focus_controller.cc
diff --git a/ui/wm/core/focus_controller.cc b/ui/wm/core/focus_controller.cc
index 1fee190f450f2b5e8a0eed02ba4d66daa17c75fe..d062903216a0a763eaeb13e465187f1892ef6149 100644
--- a/ui/wm/core/focus_controller.cc
+++ b/ui/wm/core/focus_controller.cc
@@ -10,7 +10,6 @@
#include "ui/aura/client/focus_change_observer.h"
#include "ui/aura/env.h"
#include "ui/aura/window_tracker.h"
-#include "ui/base/ime/text_input_focus_manager.h"
#include "ui/events/event.h"
#include "ui/wm/core/focus_rules.h"
#include "ui/wm/core/window_util.h"
@@ -231,14 +230,6 @@ void FocusController::SetFocusedWindow(aura::Window* window) {
base::AutoReset<bool> updating_focus(&updating_focus_, true);
aura::Window* lost_focus = focused_window_;
- // |window| is going to get the focus, so reset the text input client.
- // OnWindowFocused() may set a proper text input client if the implementation
- // supports text input.
- ui::TextInputFocusManager* text_input_focus_manager =
- ui::TextInputFocusManager::GetInstance();
- if (window)
- text_input_focus_manager->FocusTextInputClient(NULL);
-
// Allow for the window losing focus to be deleted during dispatch. If it is
// deleted pass NULL to observers instead of a deleted window.
aura::WindowTracker window_tracker;
@@ -270,10 +261,6 @@ void FocusController::SetFocusedWindow(aura::Window* window) {
focused_window_,
window_tracker.Contains(lost_focus) ? lost_focus : NULL);
}
-
- // Ensure that the text input client is reset when the window loses the focus.
- if (!window)
- text_input_focus_manager->FocusTextInputClient(NULL);
}
void FocusController::SetActiveWindow(
« no previous file with comments | « ui/views/widget/widget.cc ('k') | ui/wm/core/focus_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698