diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 14:14:01 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 14:14:01 +0000 |
| commit | 0138b4a799f9a40992c6f8ea5a43bf40f8a620f0 (patch) | |
| tree | edc25299410679f9af9248a0cfe8c8cb95916d92 /chrome/browser/cocoa/preferences_window_controller.mm | |
| parent | 01d0b90a9dbac157dc639f472a4c2bec51a6118d (diff) | |
| download | chromium_src-0138b4a799f9a40992c6f8ea5a43bf40f8a620f0.zip chromium_src-0138b4a799f9a40992c6f8ea5a43bf40f8a620f0.tar.gz chromium_src-0138b4a799f9a40992c6f8ea5a43bf40f8a620f0.tar.bz2 | |
Update password manager prefs UI on policy refresh.
Preferences.xib changes: Bind Enabled state of password manager radio matrix and button to the new @properties.
BUG=52830
TEST=Change password manager policy, watch preferences UI.
Review URL: http://codereview.chromium.org/3241005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/preferences_window_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/preferences_window_controller.mm | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index 7c62797..a3026f9 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -421,6 +421,8 @@ class ManagedPrefsBannerState : public ManagedPrefsBannerBase { @synthesize showHomeButtonEnabled = showHomeButtonEnabled_; @synthesize autoFillSettingsButtonEnabled = autoFillSettingsButtonEnabled_; +@synthesize passwordManagerChoiceEnabled = passwordManagerChoiceEnabled_; +@synthesize passwordManagerButtonEnabled = passwordManagerButtonEnabled_; @synthesize proxiesConfigureButtonEnabled = proxiesConfigureButtonEnabled_; @synthesize restoreButtonsEnabled = restoreButtonsEnabled_; @synthesize restoreURLsEnabled = restoreURLsEnabled_; @@ -495,6 +497,9 @@ class ManagedPrefsBannerState : public ManagedPrefsBannerBase { bool autofill_disabled_by_policy = autoFillEnabled_.IsManaged() && !autoFillEnabled_.GetValue(); [self setAutoFillSettingsButtonEnabled:!autofill_disabled_by_policy]; + [self setPasswordManagerChoiceEnabled:!askSavePasswords_.IsManaged()]; + [self setPasswordManagerButtonEnabled: + !askSavePasswords_.IsManaged() || askSavePasswords_.GetValue()]; // Initialize the proxy pref set observer. proxyPrefs_.reset( @@ -1237,6 +1242,9 @@ const int kDisabledIndex = 1; if (*prefName == prefs::kPasswordManagerEnabled) { [self setPasswordManagerEnabledIndex:askSavePasswords_.GetValue() ? kEnabledIndex : kDisabledIndex]; + [self setPasswordManagerChoiceEnabled:!askSavePasswords_.IsManaged()]; + [self setPasswordManagerButtonEnabled: + !askSavePasswords_.IsManaged() || askSavePasswords_.GetValue()]; } if (*prefName == prefs::kAutoFillEnabled) { bool autofill_disabled_by_policy = @@ -1364,18 +1372,13 @@ const int kDisabledIndex = 1; else [self recordUserAction:UserMetricsAction( "Options_PasswordManager_Disable")]; - askSavePasswords_.SetValue(value == kEnabledIndex ? true : false); + askSavePasswords_.SetValueIfNotManaged(value == kEnabledIndex ? true : false); } - (NSInteger)passwordManagerEnabledIndex { return askSavePasswords_.GetValue() ? kEnabledIndex : kDisabledIndex; } -// Returns whether the password manager buttons should be enabled. -- (BOOL)isPasswordManagerEnabled { - return !askSavePasswords_.IsManaged(); -} - - (void)setIsUsingDefaultTheme:(BOOL)value { if (value) [self recordUserAction:UserMetricsAction( |