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

Unified Diff: ui/keyboard/keyboard_util.cc

Issue 320223002: Add device policy: Kiosk Virtual Keyboard Layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months 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: 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() {
« components/policy/resources/policy_templates.json ('K') | « ui/keyboard/keyboard_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698