diff options
| -rw-r--r-- | chrome/browser/chromeos/login/user_controller.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc index 357f08a..651316e 100644 --- a/chrome/browser/chromeos/login/user_controller.cc +++ b/chrome/browser/chromeos/login/user_controller.cc @@ -26,7 +26,6 @@ #include "views/background.h" #include "views/controls/label.h" #include "views/controls/throbber.h" -#include "views/focus/focus_manager.h" #include "views/painter.h" using views::Widget; @@ -169,21 +168,14 @@ void UserController::Init(int index, } void UserController::ClearAndEnableFields() { - user_input_->EnableInputControls(true); user_input_->ClearAndFocusControls(); + user_input_->EnableInputControls(true); StopThrobber(); } void UserController::ClearAndEnablePassword() { - // Somehow focus manager thinks that textfield is still focused but the - // textfield doesn't know that. So we clear focus for focus manager so it - // sets focus on the textfield again. - // TODO(avayvod): Fix the actual issue. - views::FocusManager* focus_manager = controls_window_->GetFocusManager(); - if (focus_manager) - focus_manager->ClearFocus(); - user_input_->EnableInputControls(true); user_input_->ClearAndFocusPassword(); + user_input_->EnableInputControls(true); StopThrobber(); } |