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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2500653002: MD Settings: Add import data dialog. (Closed)
Patch Set: Fix bad merge Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 13bcfe07774fee5ae1a8b3e4cc4011896f87ec07..7b99d0429448af60b174c9198949d130e5d7be25 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -676,6 +676,29 @@ void AddResetStrings(content::WebUIDataSource* html_source) {
#endif
}
+#if !defined(OS_CHROMEOS)
+void AddImportDataStrings(content::WebUIDataSource* html_source) {
+ LocalizedString localized_strings[] = {
+ {"importTitle", IDS_SETTINGS_IMPORT_SETTINGS_TITLE},
+ {"importFromLabel", IDS_SETTINGS_IMPORT_FROM_LABEL},
+ {"importDescription", IDS_SETTINGS_IMPORT_ITEMS_LABEL},
+ {"importLoading", IDS_SETTINGS_IMPORT_LOADING_PROFILES},
+ {"importHistory", IDS_SETTINGS_IMPORT_HISTORY_CHECKBOX},
+ {"importFavorites", IDS_SETTINGS_IMPORT_FAVORITES_CHECKBOX},
+ {"importPasswords", IDS_SETTINGS_IMPORT_PASSWORDS_CHECKBOX},
+ {"importSearch", IDS_SETTINGS_IMPORT_SEARCH_ENGINES_CHECKBOX},
+ {"importAutofillFormData", IDS_SETTINGS_IMPORT_AUTOFILL_FORM_DATA_CHECKBOX},
+ {"importSucceeded", IDS_SETTINGS_IMPORT_SUCCEEDED},
+ {"importChooseFile", IDS_SETTINGS_IMPORT_CHOOSE_FILE},
+ {"importCommit", IDS_SETTINGS_IMPORT_COMMIT},
+ {"noProfileFound", IDS_SETTINGS_IMPORT_NO_PROFILE_FOUND},
+ {"findYourImportedBookmarks", IDS_SETTINGS_IMPORT_FIND_YOUR_BOOKMARKS},
+ };
+ AddLocalizedStringsBulk(html_source, localized_strings,
+ arraysize(localized_strings));
+}
+#endif
+
#if defined(OS_CHROMEOS)
void AddDateTimeStrings(content::WebUIDataSource* html_source) {
LocalizedString localized_strings[] = {
@@ -735,26 +758,6 @@ void AddEasyUnlockStrings(content::WebUIDataSource* html_source) {
chrome::kEasyUnlockLearnMoreUrl);
}
-void AddImportDataStrings(content::WebUIDataSource* html_source) {
- LocalizedString localized_strings[] = {
- {"importFromLabel", IDS_SETTINGS_IMPORT_FROM_LABEL},
- {"importDescription", IDS_SETTINGS_IMPORT_ITEMS_LABEL},
- {"importLoading", IDS_SETTINGS_IMPORT_LOADING_PROFILES},
- {"importHistory", IDS_SETTINGS_IMPORT_HISTORY_CHECKBOX},
- {"importFavorites", IDS_SETTINGS_IMPORT_FAVORITES_CHECKBOX},
- {"importPasswords", IDS_SETTINGS_IMPORT_PASSWORDS_CHECKBOX},
- {"importSearch", IDS_SETTINGS_IMPORT_SEARCH_ENGINES_CHECKBOX},
- {"importAutofillFormData", IDS_SETTINGS_IMPORT_AUTOFILL_FORM_DATA_CHECKBOX},
- {"importSucceeded", IDS_SETTINGS_IMPORT_SUCCEEDED},
- {"importChooseFile", IDS_SETTINGS_IMPORT_CHOOSE_FILE},
- {"importCommit", IDS_SETTINGS_IMPORT_COMMIT},
- {"noProfileFound", IDS_SETTINGS_IMPORT_NO_PROFILE_FOUND},
- {"findYourImportedBookmarks", IDS_SETTINGS_IMPORT_FIND_YOUR_BOOKMARKS},
- };
- AddLocalizedStringsBulk(html_source, localized_strings,
- arraysize(localized_strings));
-}
-
void AddInternetStrings(content::WebUIDataSource* html_source) {
LocalizedString localized_strings[] = {
{"internetAddConnection", IDS_SETTINGS_INTERNET_ADD_CONNECTION},
@@ -1772,12 +1775,12 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
AddDateTimeStrings(html_source);
AddDeviceStrings(html_source);
AddEasyUnlockStrings(html_source);
- AddImportDataStrings(html_source);
AddInternetStrings(html_source);
AddMultiProfilesStrings(html_source, profile);
#else
- AddSystemStrings(html_source);
AddDefaultBrowserStrings(html_source);
+ AddImportDataStrings(html_source);
+ AddSystemStrings(html_source);
#endif
#if defined(USE_NSS_CERTS)
« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698