| Index: chrome/browser/policy/policy_browsertest.cc
|
| diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
|
| index 6a40f263c5a905d5a9e6467808220c31854695ca..9d98cacce9d81f8299cb729fd10dbd00220f230a 100644
|
| --- a/chrome/browser/policy/policy_browsertest.cc
|
| +++ b/chrome/browser/policy/policy_browsertest.cc
|
| @@ -151,6 +151,7 @@
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/ash/screenshot_taker.h"
|
| #include "chromeos/audio/cras_audio_handler.h"
|
| +#include "ui/keyboard/keyboard_util.h"
|
| #endif
|
|
|
| #if !defined(OS_MACOSX)
|
| @@ -2414,7 +2415,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ScreenMagnifierTypeFull) {
|
| EXPECT_TRUE(magnification_manager->IsMagnifierEnabled());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) {
|
| +IN_PROC_BROWSER_TEST_F(PolicyTest, AccessibilityVirtualKeyboardEnabled) {
|
| // Verifies that the on-screen keyboard accessibility feature can be
|
| // controlled through policy.
|
| chromeos::AccessibilityManager* accessibility_manager =
|
| @@ -2437,6 +2438,36 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) {
|
| EXPECT_FALSE(accessibility_manager->IsVirtualKeyboardEnabled());
|
| }
|
|
|
| +IN_PROC_BROWSER_TEST_F(PolicyTest, VirtualKeyboardEnabled) {
|
| + // Verify keyboard disabled by default.
|
| + EXPECT_FALSE(keyboard::IsKeyboardEnabled());
|
| + // Verify keyboard can be toggled by default.
|
| + keyboard::SetTouchKeyboardEnabled(true);
|
| + EXPECT_TRUE(keyboard::IsKeyboardEnabled());
|
| + keyboard::SetTouchKeyboardEnabled(false);
|
| + EXPECT_FALSE(keyboard::IsKeyboardEnabled());
|
| +
|
| + // Verify policy can enable the keyboard.
|
| + PolicyMap policies;
|
| + policies.Set(key::kTouchVirtualKeyboardEnabled,
|
| + POLICY_LEVEL_MANDATORY,
|
| + POLICY_SCOPE_USER,
|
| + base::Value::CreateBooleanValue(true),
|
| + NULL);
|
| + UpdateProviderPolicy(policies);
|
| + EXPECT_TRUE(keyboard::IsKeyboardEnabled());
|
| +
|
| + // Verify that user cannot set keyboard enabled when policy disables it.
|
| + policies.Set(key::kTouchVirtualKeyboardEnabled,
|
| + POLICY_LEVEL_MANDATORY,
|
| + POLICY_SCOPE_USER,
|
| + base::Value::CreateBooleanValue(false),
|
| + NULL);
|
| + UpdateProviderPolicy(policies);
|
| + keyboard::SetTouchKeyboardEnabled(true);
|
| + EXPECT_FALSE(keyboard::IsKeyboardEnabled());
|
| +}
|
| +
|
| #endif
|
|
|
| namespace {
|
|
|