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

Unified Diff: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

Issue 2444443002: cros: Allow pin keyboard to keep focus without popping up the pin keyboard. (Closed)
Patch Set: Fixed patch set 4 errors. Created 4 years, 1 month 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
Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index 9ca796be6a113fea916955dfb194be654bacad8a..b10e37e54520106102b04ece8082214a530600e8 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -44,6 +44,7 @@
#include "ui/display/screen.h"
#include "ui/gfx/geometry/size.h"
#include "ui/keyboard/keyboard_controller.h"
+#include "ui/keyboard/keyboard_util.h"
namespace {
@@ -71,6 +72,10 @@ CoreOobeHandler::CoreOobeHandler(OobeUI* oobe_ui)
}
CoreOobeHandler::~CoreOobeHandler() {
+ // 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::SetForceDisableVirtualKeyboardForWebUi(false);
}
void CoreOobeHandler::SetDelegate(Delegate* delegate) {
@@ -141,6 +146,8 @@ void CoreOobeHandler::RegisterMessages() {
&CoreOobeHandler::HandleEnableLargeCursor);
AddCallback("enableVirtualKeyboard",
&CoreOobeHandler::HandleEnableVirtualKeyboard);
+ AddCallback("setForceDisableVirtualKeyboard",
+ &CoreOobeHandler::HandleSetForceDisableVirtualKeyboard);
AddCallback("enableScreenMagnifier",
&CoreOobeHandler::HandleEnableScreenMagnifier);
AddCallback("enableSpokenFeedback",
@@ -324,6 +331,10 @@ void CoreOobeHandler::HandleEnableVirtualKeyboard(bool enabled) {
AccessibilityManager::Get()->EnableVirtualKeyboard(enabled);
}
+void CoreOobeHandler::HandleSetForceDisableVirtualKeyboard(bool disable) {
+ keyboard::SetForceDisableVirtualKeyboardForWebUi(disable);
+}
+
void CoreOobeHandler::HandleEnableScreenMagnifier(bool enabled) {
// TODO(nkostylev): Add support for partial screen magnifier.
DCHECK(MagnificationManager::Get());

Powered by Google App Engine
This is Rietveld 408576698