chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc - Issue 2013963003: Add the Mac OSX Keychain message to the Passwords Page.

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

Issue 2013963003: Add the Mac OSX Keychain message to the Passwords Page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments

Download patch

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 b59a0afbd233825995f8c4d4c2171c502823b42d..f23f83c7ec30e60b3e80570e7310469c22c67d55 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

@@ -641,33 +641,36 @@ void AddOnStartupStrings(content::WebUIDataSource* html_source) {

void AddPasswordsAndFormsStrings(content::WebUIDataSource* html_source) {

LocalizedString localized_strings[] = {

- {"overflowMenu", IDS_SETTINGS_OVERFLOW_MENU},

Dan Beam 2016/05/26 18:57:28 did clang format do this? 4\s is correct (AFAIK)

hcarmona 2016/05/26 19:29:01 Yes, ran format. Not needed anymore.

- {"passwordsAndAutofillPageTitle",

- IDS_SETTINGS_PASSWORDS_AND_AUTOFILL_PAGE_TITLE},

- {"autofill", IDS_SETTINGS_AUTOFILL},

- {"addresses", IDS_SETTINGS_AUTOFILL_ADDRESSES_HEADING},

- {"addAddress", IDS_SETTINGS_AUTOFILL_ADD_ADDRESS_BUTTON},

- {"editAddress", IDS_SETTINGS_ADDRESS_EDIT},

- {"removeAddress", IDS_SETTINGS_ADDRESS_REMOVE},

- {"creditCards", IDS_SETTINGS_AUTOFILL_CREDIT_CARD_HEADING},

- {"addCreditCard", IDS_SETTINGS_AUTOFILL_ADD_CREDIT_CARD_BUTTON},

- {"editCreditCard", IDS_SETTINGS_CREDIT_CARD_EDIT},

- {"removeCreditCard", IDS_SETTINGS_CREDIT_CARD_REMOVE},

- {"creditCardType", IDS_SETTINGS_AUTOFILL_CREDIT_CARD_TYPE_COLUMN_LABEL},

- {"creditCardExpiration",

- IDS_SETTINGS_AUTOFILL_CREDIT_CARD_EXPIRATION_COLUMN_LABEL},

- {"autofillDetail", IDS_SETTINGS_AUTOFILL_DETAIL},

- {"passwords", IDS_SETTINGS_PASSWORDS},

- {"passwordsDetail", IDS_SETTINGS_PASSWORDS_DETAIL},

- {"savedPasswordsHeading", IDS_SETTINGS_PASSWORDS_SAVED_HEADING},

- {"passwordExceptionsHeading", IDS_SETTINGS_PASSWORDS_EXCEPTIONS_HEADING},

- {"deletePasswordException", IDS_SETTINGS_PASSWORDS_DELETE_EXCEPTION},

- {"editPassword", IDS_SETTINGS_PASSWORD_EDIT},

- {"removePassword", IDS_SETTINGS_PASSWORD_REMOVE},

- {"editPasswordTitle", IDS_SETTINGS_PASSWORDS_EDIT_TITLE},

- {"editPasswordWebsiteLabel", IDS_SETTINGS_PASSWORDS_WEBSITE},

- {"editPasswordUsernameLabel", IDS_SETTINGS_PASSWORDS_USERNAME},

- {"editPasswordPasswordLabel", IDS_SETTINGS_PASSWORDS_PASSWORD},

+ {"overflowMenu", IDS_SETTINGS_OVERFLOW_MENU},

+ {"passwordsAndAutofillPageTitle",

+ IDS_SETTINGS_PASSWORDS_AND_AUTOFILL_PAGE_TITLE},

+ {"autofill", IDS_SETTINGS_AUTOFILL},

+ {"addresses", IDS_SETTINGS_AUTOFILL_ADDRESSES_HEADING},

+ {"addAddress", IDS_SETTINGS_AUTOFILL_ADD_ADDRESS_BUTTON},

+ {"editAddress", IDS_SETTINGS_ADDRESS_EDIT},

+ {"removeAddress", IDS_SETTINGS_ADDRESS_REMOVE},

+ {"creditCards", IDS_SETTINGS_AUTOFILL_CREDIT_CARD_HEADING},

+ {"addCreditCard", IDS_SETTINGS_AUTOFILL_ADD_CREDIT_CARD_BUTTON},

+ {"editCreditCard", IDS_SETTINGS_CREDIT_CARD_EDIT},

+ {"removeCreditCard", IDS_SETTINGS_CREDIT_CARD_REMOVE},

+ {"creditCardType", IDS_SETTINGS_AUTOFILL_CREDIT_CARD_TYPE_COLUMN_LABEL},

+ {"creditCardExpiration",

+ IDS_SETTINGS_AUTOFILL_CREDIT_CARD_EXPIRATION_COLUMN_LABEL},

+ {"autofillDetail", IDS_SETTINGS_AUTOFILL_DETAIL},

+ {"passwords", IDS_SETTINGS_PASSWORDS},

+ {"passwordsDetail", IDS_SETTINGS_PASSWORDS_DETAIL},

+ {"savedPasswordsHeading", IDS_SETTINGS_PASSWORDS_SAVED_HEADING},

+ {"passwordExceptionsHeading", IDS_SETTINGS_PASSWORDS_EXCEPTIONS_HEADING},

+ {"deletePasswordException", IDS_SETTINGS_PASSWORDS_DELETE_EXCEPTION},

+ {"editPassword", IDS_SETTINGS_PASSWORD_EDIT},

+ {"removePassword", IDS_SETTINGS_PASSWORD_REMOVE},

+ {"editPasswordTitle", IDS_SETTINGS_PASSWORDS_EDIT_TITLE},

+ {"editPasswordWebsiteLabel", IDS_SETTINGS_PASSWORDS_WEBSITE},

+ {"editPasswordUsernameLabel", IDS_SETTINGS_PASSWORDS_USERNAME},

+ {"editPasswordPasswordLabel", IDS_SETTINGS_PASSWORDS_PASSWORD},

+#if defined(OS_MACOSX)

+ {"passwordsMacKeychainWarning", IDS_SETTINGS_PASSWORDS_MAC_WARNING},

+#endif

};

html_source->AddString(

"managePasswordsLabel",

« chrome/browser/resources/settings/settings_resources.grd ('K') | « chrome/browser/resources/settings/settings_resources.grd ('k') | no next file » | no next file with comments »