Add the Mac OSX Keychain message to the Passwords Page.

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 623 matching lines @@
       {"onStartupSiteUrl", IDS_SETTINGS_ON_STARTUP_SITE_URL},
       {"onStartupRemove", IDS_SETTINGS_ON_STARTUP_REMOVE},
       {"onStartupEdit", IDS_SETTINGS_ON_STARTUP_EDIT},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 
 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) in C++ (which differs from JS)

[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",
       l10n_util::GetStringFUTF16(
           IDS_SETTINGS_PASSWORDS_MANAGE_PASSWORDS,
           base::ASCIIToUTF16(
               password_manager::kPasswordManagerAccountDashboardURL)));
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
@@ skipping 361 matching lines @@
 #endif
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings