diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 18:18:34 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 18:18:34 +0000 |
| commit | f75423f1f95a2ac83d5653937706ca80be464d16 (patch) | |
| tree | 0b9bcc7b4fa6f4632a3ccc6bb09c22f98d4191d4 /chrome/browser | |
| parent | 335fe75892b1d52b76071429e45040f12c676701 (diff) | |
| download | chromium_src-f75423f1f95a2ac83d5653937706ca80be464d16.zip chromium_src-f75423f1f95a2ac83d5653937706ca80be464d16.tar.gz chromium_src-f75423f1f95a2ac83d5653937706ca80be464d16.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
4 files changed, 16 insertions, 0 deletions
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 6dfa1aa..80a16a3 100644 --- a/chrome/browser/resources/options/personal_options.js +++ b/chrome/browser/resources/options/personal_options.js @@ -134,6 +134,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 0851e4f..281dfc2 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)); |