| 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 428e632cc99d1f7ac438731828365bc539e5d8be..4b1cd8ba9bf5098fd3fdba980f90c3710e1583c5 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
|
| @@ -256,8 +256,8 @@ void CoreOobeHandler::ShowControlBar(bool show) {
|
| CallJSOrDefer("showControlBar", show);
|
| }
|
|
|
| -void CoreOobeHandler::ShowPinKeyboard(bool show) {
|
| - CallJSOrDefer("showPinKeyboard", show);
|
| +void CoreOobeHandler::SetVirtualKeyboardShown(bool shown) {
|
| + CallJSOrDefer("setVirtualKeyboardShown", shown);
|
| }
|
|
|
| void CoreOobeHandler::SetClientAreaSize(int width, int height) {
|
| @@ -301,6 +301,15 @@ void CoreOobeHandler::HandleEnableVirtualKeyboard(bool enabled) {
|
|
|
| void CoreOobeHandler::HandleSetForceDisableVirtualKeyboard(bool disable) {
|
| scoped_keyboard_disabler_.SetForceDisableVirtualKeyboard(disable);
|
| +
|
| + if (disable) {
|
| + keyboard::KeyboardController* controller =
|
| + keyboard::KeyboardController::GetInstance();
|
| + if (controller) {
|
| + controller->HideKeyboard(
|
| + keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
|
| + }
|
| + }
|
| }
|
|
|
| void CoreOobeHandler::HandleEnableScreenMagnifier(bool enabled) {
|
| @@ -441,7 +450,7 @@ void CoreOobeHandler::UpdateKeyboardState() {
|
| if (keyboard_controller) {
|
| gfx::Rect bounds = keyboard_controller->current_keyboard_bounds();
|
| ShowControlBar(bounds.IsEmpty());
|
| - ShowPinKeyboard(bounds.IsEmpty());
|
| + SetVirtualKeyboardShown(!bounds.IsEmpty());
|
| }
|
| }
|
|
|
|
|