chromium/src
0
Fork 0
Code Activity

Replace multi-value keyboard flags with single value flag types.

Browse Source 
Use the new disable value flags to replace multi-value keyboard flags. This has
the property that the multi-value flag had (can change without a string update)
and makes it clear to the user which value is default.

BUG=245319

Review URL: https://codereview.chromium.org/1488303005

Cr-Commit-Position: refs/heads/master@{#363484}
This commit is contained in:
flackr
2015-12-07 07:43:05 -08:00
committed by Commit bot
parent 527b9dfd69
commit 512a1038ba
7 changed files with 36 additions and 134 deletions

4
ash/virtual_keyboard_controller_unittest.cc

@ -51,8 +51,8 @@ class VirtualKeyboardControllerTest : public AshTestBase {
}
void SetUp() override {
base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
keyboard::switches::kSmartVirtualKeyboard, "disabled");
base::CommandLine::ForCurrentProcess()->AppendSwitch(
keyboard::switches::kDisableSmartVirtualKeyboard);
AshTestBase::SetUp();
UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());

2
chrome/app/generated_resources.grd

@ -13360,7 +13360,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@gmail.com</ex
Virtual Keyboard Overscroll
</message>
<message name="IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION" desc="Description of about:flags option to turn on overscrolling for the virtual keyboard">
Enable virtual keyboard overscroll support.
Enables virtual keyboard overscroll support.
</message>
<message name="IDS_FLAGS_INPUT_VIEW_NAME" desc="Name of about::flags option to enable IME extensions to override the virtual keyboard view">

61
chrome/browser/about_flags.cc

@ -396,46 +396,6 @@ const FeatureEntry::Choice kDataSaverPromptChoices[] = {
chromeos::switches::kDataSaverPromptDemoMode },
};
const FeatureEntry::Choice kFloatingVirtualKeyboardChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
{ IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
keyboard::switches::kFloatingVirtualKeyboard,
keyboard::switches::kFloatingVirtualKeyboardDisabled},
{ IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
keyboard::switches::kFloatingVirtualKeyboard,
keyboard::switches::kFloatingVirtualKeyboardEnabled},
};
const FeatureEntry::Choice kSmartVirtualKeyboardChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
{ IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
keyboard::switches::kSmartVirtualKeyboard,
keyboard::switches::kSmartVirtualKeyboardDisabled},
{ IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
keyboard::switches::kSmartVirtualKeyboard,
keyboard::switches::kSmartVirtualKeyboardEnabled},
};
const FeatureEntry::Choice kGestureTypingChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
{ IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
keyboard::switches::kGestureTyping,
keyboard::switches::kGestureTypingDisabled},
{ IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
keyboard::switches::kGestureTyping,
keyboard::switches::kGestureTypingEnabled},
};
const FeatureEntry::Choice kGestureEditingChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
{ IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
keyboard::switches::kGestureEditing,
keyboard::switches::kGestureEditingDisabled},
{ IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
keyboard::switches::kGestureEditing,
keyboard::switches::kGestureEditingEnabled},
};
const FeatureEntry::Choice kDownloadNotificationChoices[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
{ IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
@ -1181,19 +1141,17 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_VIRTUAL_KEYBOARD_DESCRIPTION,
kOsCrOS,
SINGLE_VALUE_TYPE(keyboard::switches::kEnableVirtualKeyboard)},
{"enable-virtual-keyboard-overscroll",
{"virtual-keyboard-overscroll",
IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_NAME,
IDS_FLAGS_VIRTUAL_KEYBOARD_OVERSCROLL_DESCRIPTION,
kOsCrOS,
ENABLE_DISABLE_VALUE_TYPE(
keyboard::switches::kEnableVirtualKeyboardOverscroll,
SINGLE_DISABLE_VALUE_TYPE(
keyboard::switches::kDisableVirtualKeyboardOverscroll)},
{"enable-input-view",
{"input-view",
IDS_FLAGS_INPUT_VIEW_NAME,
IDS_FLAGS_INPUT_VIEW_DESCRIPTION,
kOsCrOS,
ENABLE_DISABLE_VALUE_TYPE(keyboard::switches::kEnableInputView,
keyboard::switches::kDisableInputView)},
SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableInputView)},
{"disable-new-korean-ime",
IDS_FLAGS_NEW_KOREAN_IME_NAME,
IDS_FLAGS_NEW_KOREAN_IME_DESCRIPTION,
@ -1211,7 +1169,7 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_VOICE_INPUT_DESCRIPTION,
kOsCrOS,
SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableVoiceInput)},
{"enable-experimental-input-view-features",
{"experimental-input-view-features",
IDS_FLAGS_EXPERIMENTAL_INPUT_VIEW_FEATURES_NAME,
IDS_FLAGS_EXPERIMENTAL_INPUT_VIEW_FEATURES_DESCRIPTION,
kOsCrOS,
@ -1221,22 +1179,23 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_FLOATING_VIRTUAL_KEYBOARD_NAME,
IDS_FLAGS_FLOATING_VIRTUAL_KEYBOARD_DESCRIPTION,
kOsCrOS,
MULTI_VALUE_TYPE(kFloatingVirtualKeyboardChoices)},
SINGLE_VALUE_TYPE(keyboard::switches::kEnableFloatingVirtualKeyboard)},
{"smart-virtual-keyboard",
IDS_FLAGS_SMART_VIRTUAL_KEYBOARD_NAME,
IDS_FLAGS_SMART_VIRTUAL_KEYBOARD_DESCRIPTION,
kOsCrOS,
MULTI_VALUE_TYPE(kSmartVirtualKeyboardChoices)},
SINGLE_DISABLE_VALUE_TYPE(
keyboard::switches::kDisableSmartVirtualKeyboard)},
{"gesture-typing",
IDS_FLAGS_GESTURE_TYPING_NAME,
IDS_FLAGS_GESTURE_TYPING_DESCRIPTION,
kOsCrOS,
MULTI_VALUE_TYPE(kGestureTypingChoices)},
SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableGestureTyping)},
{"gesture-editing",
IDS_FLAGS_GESTURE_EDITING_NAME,
IDS_FLAGS_GESTURE_EDITING_DESCRIPTION,
kOsCrOS,
MULTI_VALUE_TYPE(kGestureEditingChoices)},
SINGLE_DISABLE_VALUE_TYPE(keyboard::switches::kDisableGestureEditing)},
{"enable-fullscreen-app-list",
IDS_FLAGS_FULLSCREEN_APP_LIST_NAME,
IDS_FLAGS_FULLSCREEN_APP_LIST_DESCRIPTION,

3
tools/metrics/histograms/histograms.xml

@ -67759,6 +67759,7 @@ To add a new entry, add it with any value and run test to compute valid value.
<int value="-1490298774" label="enable-captive-portal-bypass-proxy-option"/>
<int value="-1482685863" label="enable-request-tablet-site"/>
<int value="-1460462432" label="disable-media-source"/>
<int value="-1440152291" label="disable-gesture-typing"/>
<int value="-1433719718" label="enable-webrtc-stun-origin"/>
<int value="-1433087548" label="enable-app-install-alerts"/>
<int value="-1419788257" label="enable-experimental-hotwording"/>
@ -68007,6 +68008,7 @@ To add a new entry, add it with any value and run test to compute valid value.
<int value="625273056" label="disable-boot-animation"/>
<int value="630947363" label="touch-events"/>
<int value="643725031" label="disable-touch-feedback"/>
<int value="646738320" label="disable-gesture-editing"/>
<int value="650602639" label="enable-autofill-keyboard-accessory-view"/>
<int value="683410401"
label="enable-proximity-auth-bluetooth-low-energy-discovery"/>
@ -68067,6 +68069,7 @@ To add a new entry, add it with any value and run test to compute valid value.
<int value="1105439588" label="enable-swipe-selection"/>
<int value="1107543566" label="enable-one-copy"/>
<int value="1108663108" label="disable-device-discovery-notifications"/>
<int value="1114629582" label="enable-floating-virtual-keyboard"/>
<int value="1118109174" label="enable-launcher-search-provider-api"/>
<int value="1129888794" label="ash-touch-hud"/>
<int value="1133635187" label="force-gpu-rasterization"/>

25
ui/keyboard/keyboard_switches.cc

@ -8,32 +8,17 @@ namespace keyboard {
namespace switches {
const char kDisableInputView[] = "disable-input-view";
const char kEnableInputView[] = "enable-input-view";
const char kEnableExperimentalInputViewFeatures[] =
"enable-experimental-input-view-features";
const char kDisableVoiceInput[] = "disable-voice-input";
const char kGestureTyping[] = "gesture-typing";
const char kGestureTypingEnabled[] = "enabled";
const char kGestureTypingDisabled[] = "disabled";
const char kGestureEditing[] = "gesture-editing";
const char kGestureEditingEnabled[] = "enabled";
const char kGestureEditingDisabled[] = "disabled";
const char kDisableGestureTyping[] = "disable-gesture-typing";
const char kDisableGestureEditing[] = "disable-gesture-editing";
const char kEnableVirtualKeyboard[] = "enable-virtual-keyboard";
const char kFloatingVirtualKeyboard[] = "floating-virtual-keyboard";
const char kFloatingVirtualKeyboardDisabled[] ="disabled";
const char kFloatingVirtualKeyboardEnabled[] ="enabled";
const char kSmartVirtualKeyboard[] = "smart-virtual-keyboard";
const char kSmartVirtualKeyboardDisabled[] = "disabled";
const char kSmartVirtualKeyboardEnabled[] = "enabled";
const char kEnableFloatingVirtualKeyboard[] =
"enable-floating-virtual-keyboard";
const char kDisableSmartVirtualKeyboard[] = "disable-smart-virtual-keyboard";
const char kDisableVirtualKeyboardOverscroll[] =
"disable-virtual-keyboard-overscroll";
const char kEnableVirtualKeyboardOverscroll[] =
"enable-virtual-keyboard-overscroll";
} // namespace switches
} // namespace keyboard

42
ui/keyboard/keyboard_switches.h

@ -17,62 +17,30 @@ KEYBOARD_EXPORT extern const char kDisableInputView[];
// Disables voice input.
KEYBOARD_EXPORT extern const char kDisableVoiceInput[];
// Enables an IME extension API to set a URL for specifying the contents
// of the virtual keyboard container.
KEYBOARD_EXPORT extern const char kEnableInputView[];
// Enables experimental features for IME extensions.
KEYBOARD_EXPORT extern const char kEnableExperimentalInputViewFeatures[];
// 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 kGestureTypingEnabled[];
// Disables gesture typing for the virtual keyboard.
KEYBOARD_EXPORT extern const char kGestureTypingDisabled[];
// Flag which disables gesture typing for the virtual keyboard.
KEYBOARD_EXPORT extern const char kDisableGestureTyping[];
// Controls the appearance of the settings option to enable gesture editing
// for the virtual keyboard.
KEYBOARD_EXPORT extern const char kGestureEditing[];
// Enables gesture editing for the virtual keyboard.
KEYBOARD_EXPORT extern const char kGestureEditingEnabled[];
// Disables gesture editing for the virtual keyboard.
KEYBOARD_EXPORT extern const char kGestureEditingDisabled[];
KEYBOARD_EXPORT extern const char kDisableGestureEditing[];
// Enables the virtual keyboard.
KEYBOARD_EXPORT extern const char kEnableVirtualKeyboard[];
// Floating virtual keyboard flag.
KEYBOARD_EXPORT extern const char kFloatingVirtualKeyboard[];
// Disable floating virtual keyboard.
KEYBOARD_EXPORT extern const char kFloatingVirtualKeyboardDisabled[];
// Enable floating virtual keyboard.
KEYBOARD_EXPORT extern const char kFloatingVirtualKeyboardEnabled[];
KEYBOARD_EXPORT extern const char kEnableFloatingVirtualKeyboard[];
// Disabled overscrolling of web content when the virtual keyboard is displayed.
// If disabled, the work area is resized to restrict windows from overlapping
// with the keybaord area.
KEYBOARD_EXPORT extern const char kDisableVirtualKeyboardOverscroll[];
// Enable overscrolling of web content when the virtual keyboard is displayed
// to provide access to content that would otherwise be occluded.
KEYBOARD_EXPORT extern const char kEnableVirtualKeyboardOverscroll[];
// Controls automatic showing/hiding of the keyboard based on the devices
// plugged in.
KEYBOARD_EXPORT extern const char kSmartVirtualKeyboard[];
// Enables smart deploy for the virtual keyboard.
KEYBOARD_EXPORT extern const char kSmartVirtualKeyboardEnabled[];
// Disables smart deploy for the virtual keyboard.
KEYBOARD_EXPORT extern const char kSmartVirtualKeyboardDisabled[];
KEYBOARD_EXPORT extern const char kDisableSmartVirtualKeyboard[];
} // namespace switches
} // namespace keyboard

33
ui/keyboard/keyboard_util.cc

@ -165,14 +165,8 @@ void SetKeyboardShowOverride(KeyboardShowOverride override) {
}
bool IsInputViewEnabled() {
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableInputView))
return true;
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableInputView))
return false;
// Default value if no command line flags specified.
return true;
return !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableInputView);
}
bool IsExperimentalInputViewEnabled() {
@ -181,30 +175,23 @@ bool IsExperimentalInputViewEnabled() {
}
bool IsFloatingVirtualKeyboardEnabled() {
std::string floating_virtual_keyboard_switch =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kFloatingVirtualKeyboard);
return floating_virtual_keyboard_switch ==
switches::kFloatingVirtualKeyboardEnabled;
return base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableFloatingVirtualKeyboard);
}
bool IsGestureTypingEnabled() {
return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kGestureTyping) != switches::kGestureTypingDisabled;
return !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableGestureTyping);
}
bool IsGestureEditingEnabled() {
std::string keyboard_switch =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kGestureEditing);
return keyboard_switch != switches::kGestureEditingDisabled;
return !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableGestureEditing);
}
bool IsSmartDeployEnabled() {
std::string keyboard_switch =
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kSmartVirtualKeyboard);
return keyboard_switch != switches::kSmartVirtualKeyboardDisabled;
return !base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableSmartVirtualKeyboard);
}
bool IsVoiceInputEnabled() {