Merge 53457 - Disable proxy config button and show banner if proxy prefs are managed.

chrome/browser/cocoa/preferences_window_controller.mm

Index: chrome/browser/cocoa/preferences_window_controller.mm
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index f47f0fbabdee0f3e48f2b93ddcd81995eadc5ea7..cbf7b3f4b9fcb1408fb4c2f5325298c6fda546e7 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -416,6 +416,8 @@ class ManagedPrefsBannerState : public ManagedPrefsBannerBase {
 
 @implementation PreferencesWindowController
 
+@synthesize proxiesConfigureButtonEnabled = proxiesConfigureButtonEnabled_;
+
 - (id)initWithProfile:(Profile*)profile initialPage:(OptionsPage)initialPage {
   DCHECK(profile);
   // Use initWithWindowNibPath:: instead of initWithWindowNibName: so we
@@ -483,6 +485,11 @@ class ManagedPrefsBannerState : public ManagedPrefsBannerBase {
     PersonalDataManager* personalDataManager =
         profile_->GetPersonalDataManager();
     [autoFillSettingsButton_ setHidden:(personalDataManager == NULL)];
+
+    // Initialize the proxy pref set observer.
+    proxyPrefs_.reset(
+        PrefSetObserver::CreateProxyPrefSetObserver(prefs_, observer_.get()));
+    [self setProxiesConfigureButtonEnabled:!proxyPrefs_->IsManaged()];
   }
   return self;
 }
@@ -1378,6 +1385,9 @@ const int kDisabledIndex = 1;
     // Poke KVC.
     [self setFileHandlerUIEnabled:[self fileHandlerUIEnabled]];
   }
+  else if (proxyPrefs_->IsObserved(*prefName)) {
+    [self setProxiesConfigureButtonEnabled:!proxyPrefs_->IsManaged()];
+  }
 }
 
 // Set the new download path and notify the UI via KVO.