diff options
| author | rsadam <rsadam@chromium.org> | 2015-05-06 14:20:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-06 21:21:14 +0000 |
| commit | b504002422fc21b01fee88d49e1f92b39f61e3c3 (patch) | |
| tree | 3cecad3c0799b66cd57e97a75d9243ff5be3fcf3 /ui | |
| parent | bcad31300f5c56d4bc64de5b3c668e749634ecc0 (diff) | |
| download | chromium_src-b504002422fc21b01fee88d49e1f92b39f61e3c3.zip chromium_src-b504002422fc21b01fee88d49e1f92b39f61e3c3.tar.gz chromium_src-b504002422fc21b01fee88d49e1f92b39f61e3c3.tar.bz2 | |
Refactors experimental keyboard flags to use tristates.
BUG=485104
Review URL: https://codereview.chromium.org/1126233003
Cr-Commit-Position: refs/heads/master@{#328614}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/keyboard/keyboard_switches.cc | 15 | ||||
| -rw-r--r-- | ui/keyboard/keyboard_switches.h | 28 | ||||
| -rw-r--r-- | ui/keyboard/keyboard_util.cc | 18 |
3 files changed, 47 insertions, 14 deletions
diff --git a/ui/keyboard/keyboard_switches.cc b/ui/keyboard/keyboard_switches.cc index d2a18f3..c020552 100644 --- a/ui/keyboard/keyboard_switches.cc +++ b/ui/keyboard/keyboard_switches.cc @@ -13,12 +13,21 @@ const char kDisableInputView[] = "disable-input-view"; const char kEnableInputView[] = "enable-input-view"; const char kEnableExperimentalInputViewFeatures[] = "enable-experimental-input-view-features"; -const char kEnableGestureTyping[] = "enable-gesture-typing"; -const char kEnableGestureSelection[] = "enable-gesture-selection"; -const char kEnableGestureDeletion[] = "enable-gesture-deletion"; const char kDisableVoiceInput[] = "disable-voice-input"; const char kDisableNewMDInputView[] = "disable-new-md-input-view"; +const char kGestureTyping[] = "gesture-typing"; +const char kGestureTypingEnabled[] = "enabled"; +const char kGestureTypingDisabled[] = "disabled"; + +const char kGestureSelection[] = "gesture-selection"; +const char kGestureSelectionEnabled[] = "enabled"; +const char kGestureSelectionDisabled[] = "disabled"; + +const char kGestureDeletion[] = "gesture-deletion"; +const char kGestureDeletionEnabled[] = "enabled"; +const char kGestureDeletionDisabled[] = "disabled"; + const char kEnableVirtualKeyboard[] = "enable-virtual-keyboard"; const char kFloatingVirtualKeyboard[] = "floating-virtual-keyboard"; const char kFloatingVirtualKeyboardDisabled[] ="disabled"; diff --git a/ui/keyboard/keyboard_switches.h b/ui/keyboard/keyboard_switches.h index bb4bc17..f036161 100644 --- a/ui/keyboard/keyboard_switches.h +++ b/ui/keyboard/keyboard_switches.h @@ -30,14 +30,32 @@ KEYBOARD_EXPORT extern const char kEnableInputView[]; // Enables experimental features for IME extensions. KEYBOARD_EXPORT extern const char kEnableExperimentalInputViewFeatures[]; -// Enables gesture typing for the virtual keyboard. -KEYBOARD_EXPORT extern const char kEnableGestureTyping[]; +// Gesture typing flag for the virtual keyboard. +KEYBOARD_EXPORT extern const char kGestureTyping[]; // Enables gesture typing for the virtual keyboard. -KEYBOARD_EXPORT extern const char kEnableGestureSelection[]; +KEYBOARD_EXPORT extern const char kGestureTypingEnabled[]; -// Enables gesture typing for the virtual keyboard. -KEYBOARD_EXPORT extern const char kEnableGestureDeletion[]; +// Disables gesture typing for the virtual keyboard. +KEYBOARD_EXPORT extern const char kGestureTypingDisabled[]; + +// Gesture selection for the virtual keyboard. +KEYBOARD_EXPORT extern const char kGestureSelection[]; + +// Enables gesture selection for the virtual keyboard. +KEYBOARD_EXPORT extern const char kGestureSelectionEnabled[]; + +// Disables gesture selection for the virtual keyboard. +KEYBOARD_EXPORT extern const char kGestureSelectionDisabled[]; + +// Gesture deletion for the virtual keyboard. +KEYBOARD_EXPORT extern const char kGestureDeletion[]; + +// Enables gesture deletion for the virtual keyboard. +KEYBOARD_EXPORT extern const char kGestureDeletionEnabled[]; + +// Disables gesture deletion for the virtual keyboard. +KEYBOARD_EXPORT extern const char kGestureDeletionDisabled[]; // Enables the virtual keyboard. KEYBOARD_EXPORT extern const char kEnableVirtualKeyboard[]; diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc index d861ad8..30e7ad4 100644 --- a/ui/keyboard/keyboard_util.cc +++ b/ui/keyboard/keyboard_util.cc @@ -164,18 +164,24 @@ bool IsFloatingVirtualKeyboardEnabled() { } bool IsGestureTypingEnabled() { - return base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableGestureTyping); + std::string keyboard_switch = + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kGestureTyping); + return keyboard_switch == switches::kGestureTypingEnabled; } bool IsGestureSelectionEnabled() { - return base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableGestureSelection); + std::string keyboard_switch = + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kGestureSelection); + return keyboard_switch == switches::kGestureSelectionEnabled; } bool IsGestureDeletionEnabled() { - return base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableGestureDeletion); + std::string keyboard_switch = + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kGestureDeletion); + return keyboard_switch == switches::kGestureDeletionEnabled; } bool IsMaterialDesignEnabled() { |