summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc')
-rw-r--r--chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc b/chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
index 2a0832b667a..425a808d8ea 100644
--- a/chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
+++ b/chromium/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
@@ -257,7 +257,7 @@ bool ChromeVirtualKeyboardDelegate::ShowLanguageSettings() {
base::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog"));
chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
- chrome::kLanguageOptionsSubPage);
+ chrome::kLanguageSubPage);
return true;
}
@@ -383,8 +383,15 @@ void ChromeVirtualKeyboardDelegate::OnHasInputDevices(
"fstinputlogic",
base::FeatureList::IsEnabled(chromeos::features::kImeInputLogicFst)));
features->AppendString(GenerateFeatureFlag(
- "fstnonenglish", base::FeatureList::IsEnabled(
- chromeos::features::kImeInputLogicFstNonEnglish)));
+ "fstnonenglish",
+ base::FeatureList::IsEnabled(chromeos::features::kImeInputLogicFst)));
+ features->AppendString(GenerateFeatureFlag(
+ "floatingkeyboarddefault",
+ base::FeatureList::IsEnabled(
+ chromeos::features::kVirtualKeyboardFloatingDefault)));
+ features->AppendString(GenerateFeatureFlag(
+ "mozcinputlogic",
+ base::FeatureList::IsEnabled(chromeos::features::kImeInputLogicMozc)));
results->Set("features", std::move(features));