| Index: ui/keyboard/keyboard_util.cc
|
| diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
|
| index 23404bc4f155d85673ef558ca67bc66e42c278fb..3523f0dcd1af48fc0dc49b8f6bcb0440f552163f 100644
|
| --- a/ui/keyboard/keyboard_util.cc
|
| +++ b/ui/keyboard/keyboard_util.cc
|
| @@ -25,6 +25,7 @@
|
| #include "ui/keyboard/keyboard_controller.h"
|
| #include "ui/keyboard/keyboard_switches.h"
|
| #include "ui/keyboard/keyboard_ui.h"
|
| +#include "ui/keyboard/scoped_keyboard_disabler.h"
|
|
|
| namespace {
|
|
|
| @@ -111,6 +112,9 @@ std::string GetKeyboardLayout() {
|
| }
|
|
|
| bool IsKeyboardEnabled() {
|
| + // Blocks keyboard from showing up regardless of other settings.
|
| + if (ScopedKeyboardDisabler::GetForceDisableVirtualKeyboard())
|
| + return false;
|
| // Accessibility setting prioritized over policy setting.
|
| if (g_accessibility_keyboard_enabled)
|
| return true;
|
|
|