| Index: ui/keyboard/keyboard_util.cc
|
| diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
|
| index 1752fd438fd9a49f0b8d1810baadc84b02597838..8a67e54260814d88f1b051577a67d8ac66b74f6f 100644
|
| --- a/ui/keyboard/keyboard_util.cc
|
| +++ b/ui/keyboard/keyboard_util.cc
|
| @@ -105,7 +105,7 @@ bool IsKeyboardEnabled() {
|
| if (g_keyboard_show_override == keyboard::KEYBOARD_SHOW_OVERRIDE_DISABLED)
|
| return false;
|
| // Check if any of the flags are enabled.
|
| - return CommandLine::ForCurrentProcess()->HasSwitch(
|
| + return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableVirtualKeyboard) ||
|
| g_touch_keyboard_enabled ||
|
| (g_keyboard_show_override == keyboard::KEYBOARD_SHOW_OVERRIDE_ENABLED);
|
| @@ -127,8 +127,8 @@ bool IsKeyboardOverscrollEnabled() {
|
| KEYBOARD_OVERSCROLL_OVERRIDE_ENABLED;
|
| }
|
|
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kDisableVirtualKeyboardOverscroll)) {
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kDisableVirtualKeyboardOverscroll)) {
|
| return false;
|
| }
|
| return true;
|
| @@ -143,17 +143,19 @@ void SetKeyboardShowOverride(KeyboardShowOverride override) {
|
| }
|
|
|
| bool IsInputViewEnabled() {
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableInputView))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableInputView))
|
| return true;
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableInputView))
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kDisableInputView))
|
| return false;
|
| // Default value if no command line flags specified.
|
| return true;
|
| }
|
|
|
| bool IsExperimentalInputViewEnabled() {
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableExperimentalInputViewFeatures)) {
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableExperimentalInputViewFeatures)) {
|
| return true;
|
| }
|
| return false;
|
|
|