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

chrome/browser/managed_prefs_banner_base.cc

 // 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.
 
 #include "chrome/browser/managed_prefs_banner_base.h"
 
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
@@ skipping 12 matching lines @@
       AddPref(prefs::kPasswordManagerEnabled);
       break;
     case OPTIONS_PAGE_ADVANCED:
       AddPref(prefs::kAlternateErrorPagesEnabled);
       AddPref(prefs::kSearchSuggestEnabled);
       AddPref(prefs::kDnsPrefetchingEnabled);
       AddPref(prefs::kSafeBrowsingEnabled);
 #if defined(GOOGLE_CHROME_BUILD)
       AddPref(prefs::kMetricsReportingEnabled);
 #endif
+      AddPref(prefs::kNoProxyServer);
+      AddPref(prefs::kProxyAutoDetect);
+      AddPref(prefs::kProxyServer);
+      AddPref(prefs::kProxyPacUrl);
+      AddPref(prefs::kProxyBypassList);
       break;
     default:
       NOTREACHED();
   }
 }
 
 ManagedPrefsBannerBase::~ManagedPrefsBannerBase() {
   for (PrefSet::const_iterator pref(relevant_prefs_.begin());
        pref != relevant_prefs_.end(); ++pref)
     prefs_->RemovePrefObserver(pref->c_str(), this);
@@ skipping 29 matching lines @@
 bool ManagedPrefsBannerBase::DetermineVisibility() const {
   for (PrefSet::const_iterator pref_name(relevant_prefs_.begin());
        pref_name != relevant_prefs_.end(); ++pref_name) {
     const PrefService::Preference* pref =
         prefs_->FindPreference(pref_name->c_str());
     if (pref && pref->IsManaged())
       return true;
   }
   return false;
 }