Index: chrome/browser/chromeos/login/lock/screen_locker.cc |
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc |
index a6dcfc9cfa0f50260d6b09b3f82f6e79baf47f68..dc6b76a040e3734de9f1f92a260a99af3d2615f5 100644 |
--- a/chrome/browser/chromeos/login/lock/screen_locker.cc |
+++ b/chrome/browser/chromeos/login/lock/screen_locker.cc |
@@ -63,6 +63,7 @@ |
#include "media/audio/sounds/sounds_manager.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/gfx/image/image.h" |
+#include "ui/keyboard/keyboard_util.h" |
#include "url/gurl.h" |
using base::UserMetricsAction; |
@@ -514,6 +515,11 @@ ScreenLocker::~ScreenLocker() { |
if (saved_ime_state_.get()) { |
input_method::InputMethodManager::Get()->SetState(saved_ime_state_); |
} |
+ |
+ // Screen locker occasionally blocks the virtual keyboard from being shown for |
+ // the pin keyboard. Make sure this override is turned off when exiting the |
+ // screen locker. |
+ keyboard::SetWebUiOverrideEnabled(false); |
jdufault
2016/10/26 17:56:16
I would move this to ~CoreOobeHandler and ~PeopleH
sammiequon
2016/10/27 00:22:40
Moved to ~CoreOobeHandler. I think ~PeopleHandler
|
} |
void ScreenLocker::SetAuthenticator(Authenticator* authenticator) { |