Index: chrome/browser/chromeos/login/lock/webui_screen_locker.cc |
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc |
index 6571287a4da9b3e0b18d3cf0b3155b7cfd86e908..b137ad5a559f9ce73a1c977b740eb831ae9c4301 100644 |
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc |
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc |
@@ -31,6 +31,7 @@ |
#include "ui/aura/client/capture_client.h" |
#include "ui/aura/window_event_dispatcher.h" |
#include "ui/base/l10n/l10n_util.h" |
+#include "ui/base/ui_base_switches_util.h" |
#include "ui/base/x/x11_util.h" |
#include "ui/gfx/screen.h" |
#include "ui/keyboard/keyboard_controller.h" |
@@ -93,6 +94,8 @@ void WebUIScreenLocker::LockScreen() { |
lock_window_->Show(); |
LoadURL(GURL(kLoginURL)); |
lock_window->Grab(); |
+ if (::switches::IsTextInputFocusManagerEnabled()) |
Nikita (slow)
2014/07/07 15:32:09
Can this condition be dropped?
|
+ RequestFocus(); |
login_display_.reset(new WebUILoginDisplay(this)); |
login_display_->set_background_bounds(bounds); |