| Index: ui/keyboard/keyboard_util.cc
|
| diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
|
| index 069ee13c60979d99bd0af60a0e32abacda80cf8d..653066503d61f1e087a287ad58b3952b7d26e5ca 100644
|
| --- a/ui/keyboard/keyboard_util.cc
|
| +++ b/ui/keyboard/keyboard_util.cc
|
| @@ -26,7 +26,6 @@
|
| #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 keyboard {
|
|
|
| @@ -113,9 +112,6 @@ 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;
|
|
|