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

chrome/browser/cocoa/preferences_window_controller.mm

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/preferences_window_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 398 matching lines @@
 
  private:
   PreferencesWindowController* controller_;  // weak, owns us
   OptionsPage page_;  // current options page
 };
 
 }  // namespace PreferencesWindowControllerInternal
 
 @implementation PreferencesWindowController
 
+@synthesize proxiesConfigureButtonEnabled = proxiesConfigureButtonEnabled_;
+
 - (id)initWithProfile:(Profile*)profile initialPage:(OptionsPage)initialPage {
   DCHECK(profile);
   // Use initWithWindowNibPath:: instead of initWithWindowNibName: so we
   // can override it in a unit test.
   NSString* nibPath = [mac_util::MainAppBundle()
                         pathForResource:@"Preferences"
                                  ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
     profile_ = profile->GetOriginalProfile();
     initialPage_ = initialPage;
@@ skipping 47 matching lines @@
         [[NSColor colorWithDeviceRed:0xff/255.0
                                green:0x9a/255.0
                                 blue:0x9a/255.0
                                alpha:1.0] retain]);
 
     // Disable the |autoFillSettingsButton_| if we have no
     // |personalDataManager|.
     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;
 }
 
 - (void)awakeFromNib {
 
   // Validate some assumptions in debug builds.
 
   // "Basics", "Personal Stuff", and "Under the Hood" views should be the same
   // width.  They should be the same width so they are laid out to look as good
@@ skipping 875 matching lines @@
   else if (*prefName == prefs::kEnableTranslate) {
     [self setTranslateEnabled:translateEnabled_.GetValue() ? YES : NO];
   }
   else if (*prefName == prefs::kWebkitTabsToLinks) {
     [self setTabsToLinks:tabsToLinks_.GetValue() ? YES : NO];
   }
   else if (*prefName == prefs::kDownloadExtensionsToOpen) {
     // 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.
 - (void)downloadPathPanelDidEnd:(NSOpenPanel*)panel
                            code:(NSInteger)returnCode
                         context:(void*)context {
   if (returnCode == NSOKButton) {
     [self recordUserAction:UserMetricsAction("Options_SetDownloadDirectory")];
     NSURL* path = [[panel URLs] lastObject];  // We only allow 1 item.
     [self willChangeValueForKey:@"defaultDownloadLocation"];
@@ skipping 663 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end