Merge 108137 - Add warning to Mac that passwords are shared between profiles through the underlying keychain.

BUG=102176
TEST=on Mac, with more than one profile existing, a warning is shown on the settings/personal page about profile password sharing.

Review URL: http://codereview.chromium.org/8430017

TBR=mirandac@chromium.org
Review URL: http://codereview.chromium.org/8438026

git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108218 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 19 insertions, 0 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index cba6a5b..b2a1cd0 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7931,6 +7931,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Manage saved passwords...
         </message>
       </if>
+      <message name="IDS_OPTIONS_PASSWORDS_MAC_WARNING" desc="The warning for OS X that passwords are shared across profiles in the keychain.">
+          On Mac, passwords are saved to your Keychain and may be accessed or synced by other Chrome users sharing this OS X account.
+      </message>
       <message name="IDS_OPTIONS_PASSWORDS_AUTOLOGIN" desc="The label of the 'autologinEnabled' checkbox">
         Offer to sign into Google sites automatically with this account
       </message>
diff --git a/chrome/browser/resources/options/personal_options.css b/chrome/browser/resources/options/personal_options.css
index 1fb6962..4f7856a 100644
--- a/chrome/browser/resources/options/personal_options.css
+++ b/chrome/browser/resources/options/personal_options.css
@@ -56,3 +56,7 @@
 #enable-auto-login-checkbox {
   margin-top: 10px;
 }
+
+#mac-passwords-warning {
+  margin-top: 10px;
+}
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index da7f5a2..c9a02af1 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -79,6 +79,8 @@
         </div>
         <div><button id="manage-passwords" i18n-content="manage_passwords"
             pref="profile.password_manager_enabled"></button></div>
+        <div id="mac-passwords-warning" i18n-content="macPasswordsWarning"
+            hidden></div> 
         <!-- This makes the managed-banner appear when the "pref" is
         configured by the IT administrator. -->
         <input name="password_allow_show_hidden" type="text"
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 1ca3db5..0cd10c9 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -140,6 +140,9 @@ cr.define('options', function() {
         $('manage-passwords').disabled = true;
       }
 
+      $('mac-passwords-warning').hidden =
+          !(localStrings.getString('macPasswordsWarning'));
+
       if (PersonalOptions.disableAutofillManagement()) {
         $('autofill-settings').disabled = true;
 
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc
index 6b9d625..6c34553 100644
--- a/chrome/browser/ui/webui/options/personal_options_handler.cc
+++ b/chrome/browser/ui/webui/options/personal_options_handler.cc
@@ -110,6 +110,13 @@ void PersonalOptionsHandler::GetLocalizedValues(
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_NEVERSAVE));
   localized_strings->SetString("manage_passwords",
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS));
+#if defined(OS_MACOSX)
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  if (profile_manager->GetNumberOfProfiles() > 1) {
+    localized_strings->SetString("macPasswordsWarning",
+        l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
+  }
+#endif
   localized_strings->SetString("autologinEnabled",
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_AUTOLOGIN));