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

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

Issue 2952463002: App list sync unit tests (Closed)
Patch Set: Add in dummy hooks for assistant settings launcher Created 3 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/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 1651 matching lines...) Expand 10 before | Expand all | Expand 10 after
1662 IDS_SETTINGS_SEARCH_NO_RESULTS_HELP, 1662 IDS_SETTINGS_SEARCH_NO_RESULTS_HELP,
1663 base::ASCIIToUTF16(chrome::kSettingsSearchHelpURL)); 1663 base::ASCIIToUTF16(chrome::kSettingsSearchHelpURL));
1664 html_source->AddString("searchNoResultsHelp", help_text); 1664 html_source->AddString("searchNoResultsHelp", help_text);
1665 } 1665 }
1666 1666
1667 void AddSearchStrings(content::WebUIDataSource* html_source) { 1667 void AddSearchStrings(content::WebUIDataSource* html_source) {
1668 LocalizedString localized_strings[] = { 1668 LocalizedString localized_strings[] = {
1669 {"searchPageTitle", IDS_SETTINGS_SEARCH}, 1669 {"searchPageTitle", IDS_SETTINGS_SEARCH},
1670 {"searchEnginesManage", IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES}, 1670 {"searchEnginesManage", IDS_SETTINGS_SEARCH_MANAGE_SEARCH_ENGINES},
1671 {"searchOkGoogleLabel", IDS_SETTINGS_SEARCH_OK_GOOGLE_LABEL}, 1671 {"searchOkGoogleLabel", IDS_SETTINGS_SEARCH_OK_GOOGLE_LABEL},
1672 {"searchGoogleAssistant", IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT},
1673 {"searchGoogleAssistantEnabled",
1674 IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_ENABLED},
1675 {"searchGoogleAssistantDisabled",
1676 IDS_SETTINGS_SEARCH_GOOGLE_ASSISTANT_DISABLED},
1672 {"searchOkGoogleSubtextAlwaysOn", 1677 {"searchOkGoogleSubtextAlwaysOn",
1673 IDS_SETTINGS_SEARCH_OK_GOOGLE_SUBTEXT_ALWAYS_ON}, 1678 IDS_SETTINGS_SEARCH_OK_GOOGLE_SUBTEXT_ALWAYS_ON},
1674 {"searchOkGoogleSubtextNoHardware", 1679 {"searchOkGoogleSubtextNoHardware",
1675 IDS_SETTINGS_SEARCH_OK_GOOGLE_SUBTEXT_NO_HARDWARE}, 1680 IDS_SETTINGS_SEARCH_OK_GOOGLE_SUBTEXT_NO_HARDWARE},
1676 {"searchOkGoogleAudioHistoryLabel", 1681 {"searchOkGoogleAudioHistoryLabel",
1677 IDS_SETTINGS_SEARCH_OK_GOOGLE_AUDIO_HISTORY_LABEL}, 1682 IDS_SETTINGS_SEARCH_OK_GOOGLE_AUDIO_HISTORY_LABEL},
1678 {"searchOkGoogleAudioHistorySubtext", 1683 {"searchOkGoogleAudioHistorySubtext",
1679 IDS_SETTINGS_SEARCH_OK_GOOGLE_AUDIO_HISTORY_SUBTEXT}, 1684 IDS_SETTINGS_SEARCH_OK_GOOGLE_AUDIO_HISTORY_SUBTEXT},
1680 {"searchOkGoogleRetrain", IDS_SETTINGS_SEARCH_OK_GOOGLE_RETRAIN}, 1685 {"searchOkGoogleRetrain", IDS_SETTINGS_SEARCH_OK_GOOGLE_RETRAIN},
1681 {"searchEnableGoogleNowLabel", IDS_SETTINGS_SEARCH_ENABLE_GOOGLE_NOW}, 1686 {"searchEnableGoogleNowLabel", IDS_SETTINGS_SEARCH_ENABLE_GOOGLE_NOW},
1682 }; 1687 };
1683 AddLocalizedStringsBulk(html_source, localized_strings, 1688 AddLocalizedStringsBulk(html_source, localized_strings,
1684 arraysize(localized_strings)); 1689 arraysize(localized_strings));
1685 html_source->AddString("hotwordLearnMoreUrl", 1690 html_source->AddString("hotwordLearnMoreUrl",
1686 chrome::kHotwordLearnMoreURL); 1691 chrome::kHotwordLearnMoreURL);
1687 html_source->AddString("manageAudioHistoryUrl", 1692 html_source->AddString("manageAudioHistoryUrl",
1688 chrome::kManageAudioHistoryURL); 1693 chrome::kManageAudioHistoryURL);
1689 base::string16 search_explanation_text = l10n_util::GetStringFUTF16( 1694 base::string16 search_explanation_text = l10n_util::GetStringFUTF16(
1690 IDS_SETTINGS_SEARCH_EXPLANATION, 1695 IDS_SETTINGS_SEARCH_EXPLANATION,
1691 base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL)); 1696 base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL));
1692 html_source->AddString("searchExplanation", search_explanation_text); 1697 html_source->AddString("searchExplanation", search_explanation_text);
1698 #if defined(OS_CHROMEOS)
1699 html_source->AddBoolean(
1700 "enableVoiceInteraction",
1701 chromeos::switches::IsVoiceInteractionEnabled());
1702 #endif
1693 } 1703 }
1694 1704
1695 void AddSearchEnginesStrings(content::WebUIDataSource* html_source) { 1705 void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
1696 LocalizedString localized_strings[] = { 1706 LocalizedString localized_strings[] = {
1697 {"searchEnginesPageTitle", IDS_SETTINGS_SEARCH_ENGINES}, 1707 {"searchEnginesPageTitle", IDS_SETTINGS_SEARCH_ENGINES},
1698 {"searchEnginesAddSearchEngine", 1708 {"searchEnginesAddSearchEngine",
1699 IDS_SETTINGS_SEARCH_ENGINES_ADD_SEARCH_ENGINE}, 1709 IDS_SETTINGS_SEARCH_ENGINES_ADD_SEARCH_ENGINE},
1700 {"searchEnginesEditSearchEngine", 1710 {"searchEnginesEditSearchEngine",
1701 IDS_SETTINGS_SEARCH_ENGINES_EDIT_SEARCH_ENGINE}, 1711 IDS_SETTINGS_SEARCH_ENGINES_EDIT_SEARCH_ENGINE},
1702 {"searchEngines", IDS_SETTINGS_SEARCH_ENGINES}, 1712 {"searchEngines", IDS_SETTINGS_SEARCH_ENGINES},
(...skipping 10 matching lines...) Expand all
1713 {"searchEnginesMakeDefault", IDS_SETTINGS_SEARCH_ENGINES_MAKE_DEFAULT}, 1723 {"searchEnginesMakeDefault", IDS_SETTINGS_SEARCH_ENGINES_MAKE_DEFAULT},
1714 {"searchEnginesRemoveFromList", 1724 {"searchEnginesRemoveFromList",
1715 IDS_SETTINGS_SEARCH_ENGINES_REMOVE_FROM_LIST}, 1725 IDS_SETTINGS_SEARCH_ENGINES_REMOVE_FROM_LIST},
1716 {"searchEnginesManageExtension", 1726 {"searchEnginesManageExtension",
1717 IDS_SETTINGS_SEARCH_ENGINES_MANAGE_EXTENSION}, 1727 IDS_SETTINGS_SEARCH_ENGINES_MANAGE_EXTENSION},
1718 }; 1728 };
1719 AddLocalizedStringsBulk(html_source, localized_strings, 1729 AddLocalizedStringsBulk(html_source, localized_strings,
1720 arraysize(localized_strings)); 1730 arraysize(localized_strings));
1721 } 1731 }
1722 1732
1733 void AddGoogleAssistantStrings(content::WebUIDataSource* html_source) {
1734 LocalizedString localized_strings[] = {
1735 {"googleAssistantPageTitle", IDS_SETTINGS_GOOGLE_ASSISTANT},
1736 {"googleAssistantOn",
1737 IDS_SETTINGS_GOOGLE_ASSISTANT_ON},
1738 {"googleAssistantOff",
1739 IDS_SETTINGS_GOOGLE_ASSISTANT_OFF},
1740 {"googleAssistantEnableContext",
1741 IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT},
1742 {"googleAssistantEnableContextDescription",
1743 IDS_SETTINGS_GOOGLE_ASSISTANT_ENABLE_CONTEXT_DESCRIPTION},
1744 {"googleAssistantSettings", IDS_SETTINGS_GOOGLE_ASSISTANT_SETTINGS},
1745 };
1746 AddLocalizedStringsBulk(html_source, localized_strings,
1747 arraysize(localized_strings));
1748 }
1749
1723 void AddSiteSettingsStrings(content::WebUIDataSource* html_source, 1750 void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
1724 Profile* profile) { 1751 Profile* profile) {
1725 LocalizedString localized_strings[] = { 1752 LocalizedString localized_strings[] = {
1726 {"addSite", IDS_SETTINGS_ADD_SITE}, 1753 {"addSite", IDS_SETTINGS_ADD_SITE},
1727 {"addSiteExceptionPlaceholder", 1754 {"addSiteExceptionPlaceholder",
1728 IDS_SETTINGS_ADD_SITE_EXCEPTION_PLACEHOLDER}, 1755 IDS_SETTINGS_ADD_SITE_EXCEPTION_PLACEHOLDER},
1729 {"addSiteTitle", IDS_SETTINGS_ADD_SITE_TITLE}, 1756 {"addSiteTitle", IDS_SETTINGS_ADD_SITE_TITLE},
1730 {"cookieAppCache", IDS_SETTINGS_COOKIES_APPLICATION_CACHE}, 1757 {"cookieAppCache", IDS_SETTINGS_COOKIES_APPLICATION_CACHE},
1731 {"cookieCacheStorage", IDS_SETTINGS_COOKIES_CACHE_STORAGE}, 1758 {"cookieCacheStorage", IDS_SETTINGS_COOKIES_CACHE_STORAGE},
1732 {"cookieChannelId", IDS_SETTINGS_COOKIES_CHANNEL_ID}, 1759 {"cookieChannelId", IDS_SETTINGS_COOKIES_CHANNEL_ID},
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
2181 AddCommonStrings(html_source, profile); 2208 AddCommonStrings(html_source, profile);
2182 AddDownloadsStrings(html_source); 2209 AddDownloadsStrings(html_source);
2183 AddLanguagesStrings(html_source); 2210 AddLanguagesStrings(html_source);
2184 AddOnStartupStrings(html_source); 2211 AddOnStartupStrings(html_source);
2185 AddPasswordsAndFormsStrings(html_source); 2212 AddPasswordsAndFormsStrings(html_source);
2186 AddPeopleStrings(html_source); 2213 AddPeopleStrings(html_source);
2187 AddPrintingStrings(html_source); 2214 AddPrintingStrings(html_source);
2188 AddPrivacyStrings(html_source, profile); 2215 AddPrivacyStrings(html_source, profile);
2189 AddResetStrings(html_source); 2216 AddResetStrings(html_source);
2190 AddSearchEnginesStrings(html_source); 2217 AddSearchEnginesStrings(html_source);
2218 AddGoogleAssistantStrings(html_source);
2191 AddSearchInSettingsStrings(html_source); 2219 AddSearchInSettingsStrings(html_source);
2192 AddSearchStrings(html_source); 2220 AddSearchStrings(html_source);
2193 AddSiteSettingsStrings(html_source, profile); 2221 AddSiteSettingsStrings(html_source, profile);
2194 AddWebContentStrings(html_source); 2222 AddWebContentStrings(html_source);
2195 2223
2196 #if defined(OS_CHROMEOS) 2224 #if defined(OS_CHROMEOS)
2197 AddAccountUITweaksStrings(html_source, profile); 2225 AddAccountUITweaksStrings(html_source, profile);
2198 AddAndroidAppStrings(html_source); 2226 AddAndroidAppStrings(html_source);
2199 AddBluetoothStrings(html_source); 2227 AddBluetoothStrings(html_source);
2200 AddChromeOSUserStrings(html_source, profile); 2228 AddChromeOSUserStrings(html_source, profile);
(...skipping 16 matching lines...) Expand all
2217 2245
2218 #if defined(OS_CHROMEOS) 2246 #if defined(OS_CHROMEOS)
2219 chromeos::network_element::AddLocalizedStrings(html_source); 2247 chromeos::network_element::AddLocalizedStrings(html_source);
2220 #endif 2248 #endif
2221 policy_indicator::AddLocalizedStrings(html_source); 2249 policy_indicator::AddLocalizedStrings(html_source);
2222 2250
2223 html_source->SetJsonPath(kLocalizedStringsFile); 2251 html_source->SetJsonPath(kLocalizedStringsFile);
2224 } 2252 }
2225 2253
2226 } // namespace settings 2254 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698