diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 7 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/chromeos/extensions/input_method_api.cc | 4 | ||||
| -rw-r--r-- | chrome/common/extensions/api/input_method_private.json | 3 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.cc | 3 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 1 | ||||
| -rw-r--r-- | tools/metrics/histograms/histograms.xml | 1 |
7 files changed, 25 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 7fce767..74ccd52 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -14132,6 +14132,13 @@ Do you accept? Enable IME extensions to supply custom views for user input such as virtual keyboards. </message> + <message name="IDS_FLAGS_ENABLE_NEW_QP_INPUT_VIEW_NAME" desc="Name of about::flags option to enable QP style of input view virtual keyboard."> + Enable QP input view keyboard. + </message> + <message name="IDS_FLAGS_ENABLE_NEW_QP_INPUT_VIEW_DESCRIPTION" desc="Description of about::flags option to enable the QP style of input view virtual keyboard."> + Enable input view keyboards in materia design style. + </message> + <message name="IDS_FLAGS_ENABLE_NEW_KOREAN_IME_NAME" desc="Name of about::flags option to enable the new Korean IME"> Enable new Korean IME. </message> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index e6cf1d3..1a873af 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -1291,6 +1291,13 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(chromeos::switches::kEnableNewKoreanIme) }, { + "enable-new-qp-input-view", + IDS_FLAGS_ENABLE_NEW_QP_INPUT_VIEW_NAME, + IDS_FLAGS_ENABLE_NEW_QP_INPUT_VIEW_DESCRIPTION, + kOsCrOS, + SINGLE_VALUE_TYPE(chromeos::switches::kEnableNewQPInputView) + }, + { "enable-physical-keyboard-autocorrect", IDS_FLAGS_ENABLE_PHYSICAL_KEYBOARD_AUTOCORRECT_NAME, IDS_FLAGS_ENABLE_PHYSICAL_KEYBOARD_AUTOCORRECT_DESCRIPTION, diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc index 62b4fad..644da1d 100644 --- a/chrome/browser/chromeos/extensions/input_method_api.cc +++ b/chrome/browser/chromeos/extensions/input_method_api.cc @@ -36,6 +36,10 @@ ExtensionFunction::ResponseAction GetInputMethodConfigFunction::Run() { "isPhysicalKeyboardAutocorrectEnabled", CommandLine::ForCurrentProcess()->HasSwitch( chromeos::switches::kEnablePhysicalKeyboardAutocorrect)); + output->SetBoolean( + "isNewQPInputViewEnabled", + CommandLine::ForCurrentProcess()->HasSwitch( + chromeos::switches::kEnableNewQPInputView)); return RespondNow(OneArgument(output)); #endif } diff --git a/chrome/common/extensions/api/input_method_private.json b/chrome/common/extensions/api/input_method_private.json index e3ce1d7..d3ea036 100644 --- a/chrome/common/extensions/api/input_method_private.json +++ b/chrome/common/extensions/api/input_method_private.json @@ -24,7 +24,8 @@ "type": "object", "description": "The input method config object.", "properties": { - "isPhysicalKeyboardAutocorrectEnabled": {"type": "boolean"} + "isPhysicalKeyboardAutocorrectEnabled": {"type": "boolean"}, + "isNewQPInputViewEnabled": {"type": "boolean"} } } ] diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 403d6ed..a476057 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -93,6 +93,9 @@ const char kEnableEmbeddedSignin[] = "enable-embedded-signin"; // chrome://settings/languages. const char kEnableNewKoreanIme[] = "enable-new-korean-ime"; +// If this switch is set, the input view keyboard will be in materia design. +const char kEnableNewQPInputView[] = "enable-new-qp-input-view"; + // If this switch is set, the US keyboard input method will provide suggestions // as typing on physical keyboard. const char kEnablePhysicalKeyboardAutocorrect[] = diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 275082f..84ae324 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -51,6 +51,7 @@ CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[]; CHROMEOS_EXPORT extern const char kEnableKioskMode[]; CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[]; CHROMEOS_EXPORT extern const char kEnableNewKoreanIme[]; +CHROMEOS_EXPORT extern const char kEnableNewQPInputView[]; CHROMEOS_EXPORT extern const char kEnablePhysicalKeyboardAutocorrect[]; CHROMEOS_EXPORT extern const char kEnableRequestTabletSite[]; CHROMEOS_EXPORT extern const char kEnableScreenshotTestingWithMode[]; diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 312ba7a..3f82040 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -49210,6 +49210,7 @@ To add a new entry, add it with any value and run test to compute valid value. <int value="732703958" label="enable-gesture-tap-highlight"/> <int value="773919225" label="disable-office-editing-component-extension"/> <int value="779086132" label="enable-data-reduction-proxy-alt"/> + <int value="782167080" label="enable-new-qp-input-view"/> <int value="821192723" label="show-fps-counter"/> <int value="824961931" label="use-simple-cache-backend"/> <int value="834326277" label="enable-answers-in-suggest"/> |