Commit 7d6d3e2e authored by My Nguyen's avatar My Nguyen Committed by Commit Bot

[OsSettingsLanguages] Update links for updated settings

New language settings divide into Languages and Input page.
IME settings and Virtual Keyboard settings are both Input-related, so
they should open Input page in the updated version.

Bug: 1113439
Change-Id: I0f21cbba0600d034a9f55f526638fd2ed4e63b6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422923
Commit-Queue: My Nguyen <myy@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809204}
parent 8de0b6f6
...@@ -253,9 +253,13 @@ bool ChromeVirtualKeyboardDelegate::ShowLanguageSettings() { ...@@ -253,9 +253,13 @@ bool ChromeVirtualKeyboardDelegate::ShowLanguageSettings() {
keyboard_client->HideKeyboard(ash::HideReason::kUser); keyboard_client->HideKeyboard(ash::HideReason::kUser);
base::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog")); base::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog"));
const std::string path =
base::FeatureList::IsEnabled(
::chromeos::features::kLanguageSettingsUpdate)
? chromeos::settings::mojom::kInputSubpagePath
: chromeos::settings::mojom::kLanguagesAndInputDetailsSubpagePath;
chrome::SettingsWindowManager::GetInstance()->ShowOSSettings( chrome::SettingsWindowManager::GetInstance()->ShowOSSettings(
ProfileManager::GetActiveUserProfile(), ProfileManager::GetActiveUserProfile(), path);
chromeos::settings::mojom::kLanguagesAndInputDetailsSubpagePath);
return true; return true;
} }
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
#include "chrome/browser/upgrade_detector/upgrade_detector.h" #include "chrome/browser/upgrade_detector/upgrade_detector.h"
#include "chrome/common/url_constants.h" #include "chrome/common/url_constants.h"
#include "chromeos/constants/chromeos_features.h"
#include "chromeos/constants/chromeos_switches.h" #include "chromeos/constants/chromeos_switches.h"
#include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/session_manager/session_manager_client.h" #include "chromeos/dbus/session_manager/session_manager_client.h"
...@@ -252,8 +253,12 @@ void SystemTrayClient::ShowChromeSlow() { ...@@ -252,8 +253,12 @@ void SystemTrayClient::ShowChromeSlow() {
void SystemTrayClient::ShowIMESettings() { void SystemTrayClient::ShowIMESettings() {
base::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog")); base::RecordAction(base::UserMetricsAction("OpenLanguageOptionsDialog"));
ShowSettingsSubPageForActiveUser( const std::string path =
chromeos::settings::mojom::kLanguagesAndInputDetailsSubpagePath); base::FeatureList::IsEnabled(
::chromeos::features::kLanguageSettingsUpdate)
? chromeos::settings::mojom::kInputSubpagePath
: chromeos::settings::mojom::kLanguagesAndInputDetailsSubpagePath;
ShowSettingsSubPageForActiveUser(path);
} }
void SystemTrayClient::ShowConnectedDevicesSettings() { void SystemTrayClient::ShowConnectedDevicesSettings() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment