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

Unified Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.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: chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
index 3dff8f1607ec049bde2683d9ba65d7c4e0860062..309fae82d561d53742da94276d718c7093b78eac 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
@@ -31,6 +31,7 @@
#include "chromeos/cryptohome/async_method_caller.h"
#include "chromeos/settings/cros_settings_names.h"
#include "content/public/browser/browser_thread.h"
+#include "ui/keyboard/keyboard_util.h"
namespace chromeos {
@@ -384,6 +385,18 @@ KioskAppManager::KioskAppManager() : ownership_established_(false) {
CrosSettings::Get()->AddSettingsObserver(
kAccountsPrefDeviceLocalAccountAutoLoginId,
base::Bind(&KioskAppManager::UpdateAppData, base::Unretained(this)));
+ keyboard_layout_subscription_ = CrosSettings::Get()->AddSettingsObserver(
+ kKioskVirtualKeyboardLayout,
+ base::Bind(&KioskAppManager::UpdateKeyboardLayout,
+ base::Unretained(this)));
+}
+
+void KioskAppManager::UpdateKeyboardLayout() {
+ std::string layout;
+ CrosSettings::Get()->GetString(kKioskVirtualKeyboardLayout, &layout);
+ // TODO(rsadam@): Use the policy specified layout instead of simply
+ // enabling the keyboard to the default layout.
+ keyboard::SetKioskKeyboardEnabled(!layout.empty());
}
KioskAppManager::~KioskAppManager() {}
@@ -391,6 +404,7 @@ KioskAppManager::~KioskAppManager() {}
void KioskAppManager::CleanUp() {
local_accounts_subscription_.reset();
local_account_auto_login_id_subscription_.reset();
+ keyboard_layout_subscription_.reset();
apps_.clear();
external_cache_.reset();
}

Powered by Google App Engine
This is Rietveld 408576698