Commit d2c5314a authored by Kyle Horimoto's avatar Kyle Horimoto Committed by Commit Bot

[CrOS Settings] Fix typos in route names

Change-Id: If92458c27c98f08ae856e427de3ec99628e41283
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2211282
Auto-Submit: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: default avatarTom Sepez <tsepez@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771075}
parent e5628c3a
...@@ -98,7 +98,7 @@ cr.define('settings', function() { ...@@ -98,7 +98,7 @@ cr.define('settings', function() {
r.OS_PEOPLE, mojom.SECURITY_AND_SIGN_IN_SUBPAGE_PATH, r.OS_PEOPLE, mojom.SECURITY_AND_SIGN_IN_SUBPAGE_PATH,
Subpage.kSecurityAndSignIn); Subpage.kSecurityAndSignIn);
r.FINGERPRINT = createSubpage( r.FINGERPRINT = createSubpage(
r.LOCK_SCREEN, mojom.FINGERPRINT_SUBPATH_PATH, Subpage.kFingerprint); r.LOCK_SCREEN, mojom.FINGERPRINT_SUBPAGE_PATH, Subpage.kFingerprint);
r.ACCOUNTS = createSubpage( r.ACCOUNTS = createSubpage(
r.OS_PEOPLE, mojom.MANAGE_OTHER_PEOPLE_SUBPAGE_PATH, r.OS_PEOPLE, mojom.MANAGE_OTHER_PEOPLE_SUBPAGE_PATH,
Subpage.kManageOtherPeople); Subpage.kManageOtherPeople);
...@@ -215,7 +215,7 @@ cr.define('settings', function() { ...@@ -215,7 +215,7 @@ cr.define('settings', function() {
r.OS_LANGUAGES_DETAILS, mojom.MANAGE_INPUT_METHODS_SUBPAGE_PATH, r.OS_LANGUAGES_DETAILS, mojom.MANAGE_INPUT_METHODS_SUBPAGE_PATH,
Subpage.kManageInputMethods); Subpage.kManageInputMethods);
r.OS_LANGUAGES_SMART_INPUTS = createSubpage( r.OS_LANGUAGES_SMART_INPUTS = createSubpage(
r.OS_LANGUAGES, mojom.SMART_INPUTS_SUBAGE_PATH, Subpage.kSmartInputs); r.OS_LANGUAGES, mojom.SMART_INPUTS_SUBPAGE_PATH, Subpage.kSmartInputs);
// Files section. // Files section.
if (!loadTimeData.getBoolean('isGuest')) { if (!loadTimeData.getBoolean('isGuest')) {
......
...@@ -132,7 +132,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] = ...@@ -132,7 +132,7 @@ constexpr std::pair<arc::mojom::ChromePage, const char*> kOSSettingsMapping[] =
{ChromePage::OSLANGUAGESINPUTMETHODS, {ChromePage::OSLANGUAGESINPUTMETHODS,
chromeos::settings::mojom::kManageInputMethodsSubpagePath}, chromeos::settings::mojom::kManageInputMethodsSubpagePath},
{ChromePage::OSLANGUAGESSMARTINPUTS, {ChromePage::OSLANGUAGESSMARTINPUTS,
chromeos::settings::mojom::kSmartInputsSubagePath}, chromeos::settings::mojom::kSmartInputsSubpagePath},
{ChromePage::LOCKSCREEN, {ChromePage::LOCKSCREEN,
chromeos::settings::mojom::kSecurityAndSignInSubpagePath}, chromeos::settings::mojom::kSecurityAndSignInSubpagePath},
{ChromePage::MAIN, ""}, {ChromePage::MAIN, ""},
......
...@@ -299,7 +299,7 @@ void TestAllOSSettingPages(const GURL& base_url) { ...@@ -299,7 +299,7 @@ void TestAllOSSettingPages(const GURL& base_url) {
chromeos::settings::mojom::kManageInputMethodsSubpagePath)); chromeos::settings::mojom::kManageInputMethodsSubpagePath));
TestOpenChromePage( TestOpenChromePage(
ChromePage::OSLANGUAGESSMARTINPUTS, ChromePage::OSLANGUAGESSMARTINPUTS,
base_url.Resolve(chromeos::settings::mojom::kSmartInputsSubagePath)); base_url.Resolve(chromeos::settings::mojom::kSmartInputsSubpagePath));
TestOpenChromePage( TestOpenChromePage(
ChromePage::LOCKSCREEN, ChromePage::LOCKSCREEN,
base_url.Resolve( base_url.Resolve(
......
...@@ -149,7 +149,7 @@ const string kSyncSubpagePath = "osSync"; ...@@ -149,7 +149,7 @@ const string kSyncSubpagePath = "osSync";
const string kSyncDeprecatedSubpagePath = "syncSetup"; const string kSyncDeprecatedSubpagePath = "syncSetup";
const string kSyncDeprecatedAdvancedSubpagePath = "syncSetup/advanced"; const string kSyncDeprecatedAdvancedSubpagePath = "syncSetup/advanced";
const string kSecurityAndSignInSubpagePath = "lockScreen"; const string kSecurityAndSignInSubpagePath = "lockScreen";
const string kFingerprintSubpathPath = "lockScreen/fingerprint"; const string kFingerprintSubpagePath = "lockScreen/fingerprint";
const string kManageOtherPeopleSubpagePath = "accounts"; const string kManageOtherPeopleSubpagePath = "accounts";
const string kKerberosSubpagePath = "kerberosAccounts"; const string kKerberosSubpagePath = "kerberosAccounts";
...@@ -201,7 +201,7 @@ const string kPrivacyAndSecuritySectionPath = "osPrivacy"; ...@@ -201,7 +201,7 @@ const string kPrivacyAndSecuritySectionPath = "osPrivacy";
const string kLanguagesAndInputSectionPath = "osLanguages"; const string kLanguagesAndInputSectionPath = "osLanguages";
const string kLanguagesAndInputDetailsSubpagePath = "osLanguages/details"; const string kLanguagesAndInputDetailsSubpagePath = "osLanguages/details";
const string kManageInputMethodsSubpagePath = "osLanguages/inputMethods"; const string kManageInputMethodsSubpagePath = "osLanguages/inputMethods";
const string kSmartInputsSubagePath = "osLanguages/smartInputs"; const string kSmartInputsSubpagePath = "osLanguages/smartInputs";
// Files section. // Files section.
const string kFilesSectionPath = "files"; const string kFilesSectionPath = "files";
......
...@@ -43,7 +43,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) { ...@@ -43,7 +43,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
chromeos::settings::mojom::kMyAccountsSubpagePath, chromeos::settings::mojom::kMyAccountsSubpagePath,
chromeos::settings::mojom::kSyncSubpagePath, chromeos::settings::mojom::kSyncSubpagePath,
chromeos::settings::mojom::kSecurityAndSignInSubpagePath, chromeos::settings::mojom::kSecurityAndSignInSubpagePath,
chromeos::settings::mojom::kFingerprintSubpathPath, chromeos::settings::mojom::kFingerprintSubpagePath,
chromeos::settings::mojom::kManageOtherPeopleSubpagePath, chromeos::settings::mojom::kManageOtherPeopleSubpagePath,
chromeos::settings::mojom::kKerberosSubpagePath, chromeos::settings::mojom::kKerberosSubpagePath,
...@@ -94,7 +94,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) { ...@@ -94,7 +94,7 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
chromeos::settings::mojom::kLanguagesAndInputSectionPath, chromeos::settings::mojom::kLanguagesAndInputSectionPath,
chromeos::settings::mojom::kLanguagesAndInputDetailsSubpagePath, chromeos::settings::mojom::kLanguagesAndInputDetailsSubpagePath,
chromeos::settings::mojom::kManageInputMethodsSubpagePath, chromeos::settings::mojom::kManageInputMethodsSubpagePath,
chromeos::settings::mojom::kSmartInputsSubagePath, chromeos::settings::mojom::kSmartInputsSubpagePath,
// Files section. // Files section.
chromeos::settings::mojom::kFilesSectionPath, chromeos::settings::mojom::kFilesSectionPath,
......
...@@ -57,7 +57,7 @@ const std::vector<SearchConcept>& GetLanguagesSearchConcepts() { ...@@ -57,7 +57,7 @@ const std::vector<SearchConcept>& GetLanguagesSearchConcepts() {
const std::vector<SearchConcept>& GetSmartInputsSearchConcepts() { const std::vector<SearchConcept>& GetSmartInputsSearchConcepts() {
static const base::NoDestructor<std::vector<SearchConcept>> tags({ static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_LANGUAGES_SMART_INPUTS, {IDS_OS_SETTINGS_TAG_LANGUAGES_SMART_INPUTS,
mojom::kSmartInputsSubagePath, mojom::kSmartInputsSubpagePath,
mojom::SearchResultIcon::kGlobe, mojom::SearchResultIcon::kGlobe,
mojom::SearchResultDefaultRank::kMedium, mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSubpage, mojom::SearchResultType::kSubpage,
...@@ -69,7 +69,7 @@ const std::vector<SearchConcept>& GetSmartInputsSearchConcepts() { ...@@ -69,7 +69,7 @@ const std::vector<SearchConcept>& GetSmartInputsSearchConcepts() {
const std::vector<SearchConcept>& GetAssistivePersonalInfoSearchConcepts() { const std::vector<SearchConcept>& GetAssistivePersonalInfoSearchConcepts() {
static const base::NoDestructor<std::vector<SearchConcept>> tags({ static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_LANGUAGES_PERSONAL_INFORMATION_SUGGESTIONS, {IDS_OS_SETTINGS_TAG_LANGUAGES_PERSONAL_INFORMATION_SUGGESTIONS,
mojom::kSmartInputsSubagePath, mojom::kSmartInputsSubpagePath,
mojom::SearchResultIcon::kGlobe, mojom::SearchResultIcon::kGlobe,
mojom::SearchResultDefaultRank::kMedium, mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting, mojom::SearchResultType::kSetting,
...@@ -203,7 +203,7 @@ void LanguagesSection::RegisterHierarchy(HierarchyGenerator* generator) const { ...@@ -203,7 +203,7 @@ void LanguagesSection::RegisterHierarchy(HierarchyGenerator* generator) const {
generator->RegisterTopLevelSubpage( generator->RegisterTopLevelSubpage(
IDS_SETTINGS_SMART_INPUTS_TITLE, mojom::Subpage::kSmartInputs, IDS_SETTINGS_SMART_INPUTS_TITLE, mojom::Subpage::kSmartInputs,
mojom::SearchResultIcon::kGlobe, mojom::SearchResultDefaultRank::kMedium, mojom::SearchResultIcon::kGlobe, mojom::SearchResultDefaultRank::kMedium,
mojom::kSmartInputsSubagePath); mojom::kSmartInputsSubpagePath);
generator->RegisterNestedSetting( generator->RegisterNestedSetting(
mojom::Setting::kShowPersonalInformationSuggestions, mojom::Setting::kShowPersonalInformationSuggestions,
mojom::Subpage::kSmartInputs); mojom::Subpage::kSmartInputs);
......
...@@ -203,19 +203,19 @@ const std::vector<SearchConcept>& GetKerberosSearchConcepts() { ...@@ -203,19 +203,19 @@ const std::vector<SearchConcept>& GetKerberosSearchConcepts() {
const std::vector<SearchConcept>& GetFingerprintSearchConcepts() { const std::vector<SearchConcept>& GetFingerprintSearchConcepts() {
static const base::NoDestructor<std::vector<SearchConcept>> tags({ static const base::NoDestructor<std::vector<SearchConcept>> tags({
{IDS_OS_SETTINGS_TAG_FINGERPRINT_REMOVE, {IDS_OS_SETTINGS_TAG_FINGERPRINT_REMOVE,
mojom::kFingerprintSubpathPath, mojom::kFingerprintSubpagePath,
mojom::SearchResultIcon::kFingerprint, mojom::SearchResultIcon::kFingerprint,
mojom::SearchResultDefaultRank::kMedium, mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting, mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kRemoveFingerprint}}, {.setting = mojom::Setting::kRemoveFingerprint}},
{IDS_OS_SETTINGS_TAG_FINGERPRINT_ADD, {IDS_OS_SETTINGS_TAG_FINGERPRINT_ADD,
mojom::kFingerprintSubpathPath, mojom::kFingerprintSubpagePath,
mojom::SearchResultIcon::kFingerprint, mojom::SearchResultIcon::kFingerprint,
mojom::SearchResultDefaultRank::kMedium, mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSetting, mojom::SearchResultType::kSetting,
{.setting = mojom::Setting::kAddFingerprint}}, {.setting = mojom::Setting::kAddFingerprint}},
{IDS_OS_SETTINGS_TAG_FINGERPRINT, {IDS_OS_SETTINGS_TAG_FINGERPRINT,
mojom::kFingerprintSubpathPath, mojom::kFingerprintSubpagePath,
mojom::SearchResultIcon::kFingerprint, mojom::SearchResultIcon::kFingerprint,
mojom::SearchResultDefaultRank::kMedium, mojom::SearchResultDefaultRank::kMedium,
mojom::SearchResultType::kSubpage, mojom::SearchResultType::kSubpage,
...@@ -854,7 +854,7 @@ void PeopleSection::RegisterHierarchy(HierarchyGenerator* generator) const { ...@@ -854,7 +854,7 @@ void PeopleSection::RegisterHierarchy(HierarchyGenerator* generator) const {
IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE, IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE,
mojom::Subpage::kFingerprint, mojom::Subpage::kSecurityAndSignIn, mojom::Subpage::kFingerprint, mojom::Subpage::kSecurityAndSignIn,
mojom::SearchResultIcon::kFingerprint, mojom::SearchResultIcon::kFingerprint,
mojom::SearchResultDefaultRank::kMedium, mojom::kFingerprintSubpathPath); mojom::SearchResultDefaultRank::kMedium, mojom::kFingerprintSubpagePath);
static constexpr mojom::Setting kFingerprintSettings[] = { static constexpr mojom::Setting kFingerprintSettings[] = {
mojom::Setting::kAddFingerprint, mojom::Setting::kAddFingerprint,
mojom::Setting::kRemoveFingerprint, mojom::Setting::kRemoveFingerprint,
......
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