Index: ui/keyboard/keyboard_util.cc |
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc |
index 9c89e6442b3a4ca5119511cfff249e1b63fdb3f1..737b04d703b45c70517c859976910c9d013f2adb 100644 |
--- a/ui/keyboard/keyboard_util.cc |
+++ b/ui/keyboard/keyboard_util.cc |
@@ -44,6 +44,8 @@ base::LazyInstance<GURL> g_override_content_url = LAZY_INSTANCE_INITIALIZER; |
bool g_touch_keyboard_enabled = false; |
+bool g_kiosk_keyboard_enabled = false; |
+ |
keyboard::KeyboardOverscrolOverride g_keyboard_overscroll_override = |
keyboard::KEYBOARD_OVERSCROLL_OVERRIDE_NONE; |
@@ -90,6 +92,14 @@ bool GetTouchKeyboardEnabled() { |
return g_touch_keyboard_enabled; |
} |
+void SetKioskKeyboardEnabled(bool enabled) { |
+ g_kiosk_keyboard_enabled = enabled; |
+} |
+ |
+bool GetKioskKeyboardEnabled() { |
+ return g_kiosk_keyboard_enabled; |
+} |
+ |
std::string GetKeyboardLayout() { |
// TODO(bshe): layout string is currently hard coded. We should use more |
// standard keyboard layouts. |
@@ -100,8 +110,8 @@ bool IsKeyboardEnabled() { |
return g_accessibility_keyboard_enabled || |
CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kEnableVirtualKeyboard) || |
- IsKeyboardUsabilityExperimentEnabled() || |
- g_touch_keyboard_enabled; |
+ IsKeyboardUsabilityExperimentEnabled() || g_touch_keyboard_enabled || |
+ g_kiosk_keyboard_enabled; |
} |
bool IsKeyboardUsabilityExperimentEnabled() { |