summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorrsadam <rsadam@chromium.org>2015-01-08 16:31:31 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-09 00:32:11 +0000
commit1afa04d67e08d67b3c467f5a20182582b5abdd45 (patch)
tree968dad57c767357d4ed3ab2517656935e76069fd /ui
parent30f7125f71b7c0f59997a3aefe86db63a7707bbc (diff)
downloadchromium_src-1afa04d67e08d67b3c467f5a20182582b5abdd45.zip
chromium_src-1afa04d67e08d67b3c467f5a20182582b5abdd45.tar.gz
chromium_src-1afa04d67e08d67b3c467f5a20182582b5abdd45.tar.bz2
Turns off smart deploy by default.
This CL will be reverted after branch. BUG=446868 TBR=cpu TEST=VirtualKeyboardControllerTest, VirtualKeyboardControllerAutoTest Review URL: https://codereview.chromium.org/834733004 Cr-Commit-Position: refs/heads/master@{#310638}
Diffstat (limited to 'ui')
-rw-r--r--ui/keyboard/keyboard_switches.cc2
-rw-r--r--ui/keyboard/keyboard_switches.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/keyboard/keyboard_switches.cc b/ui/keyboard/keyboard_switches.cc
index 06ce1a4..2c8d031 100644
--- a/ui/keyboard/keyboard_switches.cc
+++ b/ui/keyboard/keyboard_switches.cc
@@ -15,7 +15,7 @@ const char kEnableExperimentalInputViewFeatures[] =
"enable-experimental-input-view-features";
const char kEnableVirtualKeyboard[] = "enable-virtual-keyboard";
-const char kDisableSmartVirtualKeyboard[] = "disable-smart-virtual-keyboard";
+const char kEnableAutoVirtualKeyboard[] = "auto-virtual-keyboard";
const char kDisableVirtualKeyboardOverscroll[] =
"disable-virtual-keyboard-overscroll";
diff --git a/ui/keyboard/keyboard_switches.h b/ui/keyboard/keyboard_switches.h
index 5b9892b..8f1e7cc 100644
--- a/ui/keyboard/keyboard_switches.h
+++ b/ui/keyboard/keyboard_switches.h
@@ -36,9 +36,9 @@ KEYBOARD_EXPORT extern const char kDisableVirtualKeyboardOverscroll[];
// to provide access to content that would otherwise be occluded.
KEYBOARD_EXPORT extern const char kEnableVirtualKeyboardOverscroll[];
-// Disable automatic showing/hiding of the keyboard based on the devices plugged
+// Enable automatic showing/hiding of the keyboard based on the devices plugged
// in.
-KEYBOARD_EXPORT extern const char kDisableSmartVirtualKeyboard[];
+KEYBOARD_EXPORT extern const char kEnableAutoVirtualKeyboard[];
} // namespace switches
} // namespace keyboard