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

chrome/browser/cocoa/preferences_window_controller.h

Index: chrome/browser/cocoa/preferences_window_controller.h
diff --git a/chrome/browser/cocoa/preferences_window_controller.h b/chrome/browser/cocoa/preferences_window_controller.h
index 707f597b39591bef2bd3b33380a7056bd649ff75..ffb6c1cd1878ff610cd8e546b07a5d949ca2e0c4 100644
--- a/chrome/browser/cocoa/preferences_window_controller.h
+++ b/chrome/browser/cocoa/preferences_window_controller.h
@@ -8,6 +8,7 @@
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/pref_member.h"
+#include "chrome/browser/pref_set_observer.h"
 
 namespace PreferencesWindowControllerInternal {
 class PrefObserverBridge;
@@ -123,6 +124,8 @@ class ProfileSyncService;
   FontLanguageSettingsController* fontLanguageSettings_;
   StringPrefMember currentTheme_;
   IBOutlet NSButton* enableLoggingCheckbox_;
+  scoped_ptr<PrefSetObserver> proxyPrefs_;
+  BOOL proxiesConfigureButtonEnabled_;
 }
 
 // Designated initializer. |profile| should not be NULL.
@@ -170,6 +173,7 @@ class ProfileSyncService;
 
 // Usable from cocoa bindings to hook up the custom home pages table.
 @property (nonatomic, readonly) CustomHomePagesModel* customPagesSource;
+@property (assign, nonatomic) BOOL proxiesConfigureButtonEnabled;
 
 @end