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

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

Issue 2529793002: Remove language settings Learn More URL from desktop MD Settings (Closed)
Patch Set: rebase Created 4 years 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/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 {"editDictionaryPageTitle", IDS_SETTINGS_LANGUAGES_EDIT_DICTIONARY_TITLE}, 910 {"editDictionaryPageTitle", IDS_SETTINGS_LANGUAGES_EDIT_DICTIONARY_TITLE},
911 {"addDictionaryWordLabel", IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD}, 911 {"addDictionaryWordLabel", IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD},
912 {"addDictionaryWordButton", 912 {"addDictionaryWordButton",
913 IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD_BUTTON}, 913 IDS_SETTINGS_LANGUAGES_ADD_DICTIONARY_WORD_BUTTON},
914 {"customDictionaryWords", IDS_SETTINGS_LANGUAGES_DICTIONARY_WORDS}, 914 {"customDictionaryWords", IDS_SETTINGS_LANGUAGES_DICTIONARY_WORDS},
915 #endif 915 #endif
916 }; 916 };
917 AddLocalizedStringsBulk(html_source, localized_strings, 917 AddLocalizedStringsBulk(html_source, localized_strings,
918 arraysize(localized_strings)); 918 arraysize(localized_strings));
919 919
920 #if defined(OS_CHROMEOS)
921 // Only the Chrome OS help article explains how language order affects website
922 // language.
920 html_source->AddString( 923 html_source->AddString(
921 "languagesLearnMoreURL", 924 "languagesLearnMoreURL",
922 base::ASCIIToUTF16(chrome::kLanguageSettingsLearnMoreUrl)); 925 base::ASCIIToUTF16(chrome::kLanguageSettingsLearnMoreUrl));
926 #endif
923 } 927 }
924 928
925 #if defined(OS_CHROMEOS) 929 #if defined(OS_CHROMEOS)
926 void AddMultiProfilesStrings(content::WebUIDataSource* html_source, 930 void AddMultiProfilesStrings(content::WebUIDataSource* html_source,
927 Profile* profile) { 931 Profile* profile) {
928 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); 932 user_manager::UserManager* user_manager = user_manager::UserManager::Get();
929 933
930 const user_manager::User* user = 934 const user_manager::User* user =
931 chromeos::ProfileHelper::Get()->GetUserByProfile(profile); 935 chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
932 const user_manager::User* primary_user = user_manager->GetPrimaryUser(); 936 const user_manager::User* primary_user = user_manager->GetPrimaryUser();
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
1826 #if defined(USE_NSS_CERTS) 1830 #if defined(USE_NSS_CERTS)
1827 AddCertificateManagerStrings(html_source); 1831 AddCertificateManagerStrings(html_source);
1828 #endif 1832 #endif
1829 1833
1830 policy_indicator::AddLocalizedStrings(html_source); 1834 policy_indicator::AddLocalizedStrings(html_source);
1831 1835
1832 html_source->SetJsonPath(kLocalizedStringsFile); 1836 html_source->SetJsonPath(kLocalizedStringsFile);
1833 } 1837 }
1834 1838
1835 } // namespace settings 1839 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/languages_page/languages_page.html ('k') | chrome/common/url_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698