Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2077063002: MD Settings: Allow the user to order the list of languages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 }; 584 };
585 AddLocalizedStringsBulk(html_source, localized_strings, 585 AddLocalizedStringsBulk(html_source, localized_strings,
586 arraysize(localized_strings)); 586 arraysize(localized_strings));
587 } 587 }
588 #endif 588 #endif
589 589
590 void AddLanguagesStrings(content::WebUIDataSource* html_source) { 590 void AddLanguagesStrings(content::WebUIDataSource* html_source) {
591 LocalizedString localized_strings[] = { 591 LocalizedString localized_strings[] = {
592 {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE}, 592 {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE},
593 {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE}, 593 {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE},
594 {"orderLanguagesInstructions",
595 IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_ORDERING_INSTRUCTIONS},
596 {"moveUp", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_UP},
597 {"moveDown", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_MOVE_DOWN},
598 {"languageDetail",
599 IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_LANGUAGE_DETAIL},
594 {"manageLanguages", IDS_SETTINGS_LANGUAGES_LANGUAGES_MANAGE}, 600 {"manageLanguages", IDS_SETTINGS_LANGUAGES_LANGUAGES_MANAGE},
595 #if defined(OS_CHROMEOS) 601 #if defined(OS_CHROMEOS)
596 {"inputMethodsListTitle", 602 {"inputMethodsListTitle",
597 IDS_SETTINGS_LANGUAGES_INPUT_METHODS_LIST_TITLE}, 603 IDS_SETTINGS_LANGUAGES_INPUT_METHODS_LIST_TITLE},
598 {"manageInputMethods", IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGE}, 604 {"manageInputMethods", IDS_SETTINGS_LANGUAGES_INPUT_METHODS_MANAGE},
599 {"manageInputMethodsPageTitle", 605 {"manageInputMethodsPageTitle",
600 IDS_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_TITLE}, 606 IDS_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_TITLE},
601 #endif 607 #endif
602 {"manageLanguagesPageTitle", 608 {"manageLanguagesPageTitle",
603 IDS_SETTINGS_LANGUAGES_MANAGE_LANGUAGES_TITLE}, 609 IDS_SETTINGS_LANGUAGES_MANAGE_LANGUAGES_TITLE},
(...skipping 22 matching lines...) Expand all
626 {"manageSpellCheck", IDS_SETTINGS_LANGUAGES_SPELL_CHECK_MANAGE}, 632 {"manageSpellCheck", IDS_SETTINGS_LANGUAGES_SPELL_CHECK_MANAGE},
627 {"editDictionaryPageTitle", IDS_SETTINGS_LANGUAGES_EDIT_DICTIONARY_TITLE}, 633 {"editDictionaryPageTitle", IDS_SETTINGS_LANGUAGES_EDIT_DICTIONARY_TITLE},
628 {"addDictionaryWordLabel", IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD}, 634 {"addDictionaryWordLabel", IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD},
629 {"addDictionaryWordButton", 635 {"addDictionaryWordButton",
630 IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD_BUTTON}, 636 IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD_BUTTON},
631 {"customDictionaryWords", IDS_SETTINGS_LANGUAGES_DICTIONARY_WORDS}, 637 {"customDictionaryWords", IDS_SETTINGS_LANGUAGES_DICTIONARY_WORDS},
632 #endif 638 #endif
633 }; 639 };
634 AddLocalizedStringsBulk(html_source, localized_strings, 640 AddLocalizedStringsBulk(html_source, localized_strings,
635 arraysize(localized_strings)); 641 arraysize(localized_strings));
642
643 html_source->AddString(
644 "languagesLearnMoreURL",
645 base::ASCIIToUTF16(chrome::kLanguageSettingsLearnMoreUrl));
636 } 646 }
637 647
638 #if defined(OS_CHROMEOS) 648 #if defined(OS_CHROMEOS)
639 void AddMultiProfilesStrings(content::WebUIDataSource* html_source, 649 void AddMultiProfilesStrings(content::WebUIDataSource* html_source,
640 Profile* profile) { 650 Profile* profile) {
641 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); 651 user_manager::UserManager* user_manager = user_manager::UserManager::Get();
642 652
643 const user_manager::User* user = 653 const user_manager::User* user =
644 chromeos::ProfileHelper::Get()->GetUserByProfile(profile); 654 chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
645 std::string primary_user_email = user_manager->GetPrimaryUser()->email(); 655 std::string primary_user_email = user_manager->GetPrimaryUser()->email();
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 #endif 1155 #endif
1146 AddUsersStrings(html_source); 1156 AddUsersStrings(html_source);
1147 AddWebContentStrings(html_source); 1157 AddWebContentStrings(html_source);
1148 1158
1149 policy_indicator::AddLocalizedStrings(html_source); 1159 policy_indicator::AddLocalizedStrings(html_source);
1150 1160
1151 html_source->SetJsonPath(kLocalizedStringsFile); 1161 html_source->SetJsonPath(kLocalizedStringsFile);
1152 } 1162 }
1153 1163
1154 } // namespace settings 1164 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698