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

chrome/browser/gtk/options/advanced_contents_gtk.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/gtk/options/advanced_contents_gtk.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include <string>
@@ skipping 16 matching lines @@
 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/options/content_settings_window_gtk.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/options_page_base.h"
 #include "chrome/browser/options_util.h"
 #include "chrome/browser/pref_member.h"
+#include "chrome/browser/pref_set_observer.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/process_watcher.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
@@ skipping 295 matching lines @@
 class NetworkSection : public OptionsPageBase {
  public:
   explicit NetworkSection(Profile* profile);
   virtual ~NetworkSection() {}
 
   GtkWidget* get_page_widget() const {
     return page_;
   }
 
  private:
+  // Overridden from OptionsPageBase.
+  virtual void NotifyPrefChanged(const std::wstring* pref_name);
+
   struct ProxyConfigCommand {
     std::string binary;
     const char** argv;
   };
   // The callback functions for invoking the proxy config dialog.
   static void OnChangeProxiesButtonClicked(GtkButton *button,
                                            NetworkSection* section);
   // Search $PATH to find one of the commands. Store the full path to
   // it in the |binary| field and the command array index in in |index|.
   static bool SearchPATH(ProxyConfigCommand* commands, size_t ncommands,
                          size_t* index);
   // Start the given proxy configuration utility.
   static void StartProxyConfigUtil(const ProxyConfigCommand& command);
 
+  // Tracks the state of proxy preferences.
+  scoped_ptr<PrefSetObserver> proxy_prefs_;
+
   // The widget containing the options for this section.
   GtkWidget* page_;
 
+  // The proxy configuration button.
+  GtkWidget* change_proxies_button_;
+
   DISALLOW_COPY_AND_ASSIGN(NetworkSection);
 };
 
 NetworkSection::NetworkSection(Profile* profile)
     : OptionsPageBase(profile) {
   page_ = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   GtkWidget* proxy_description_label = CreateWrappedLabel(
       IDS_OPTIONS_PROXIES_LABEL);
   gtk_misc_set_alignment(GTK_MISC(proxy_description_label), 0, 0);
   gtk_box_pack_start(GTK_BOX(page_), proxy_description_label,
                      FALSE, FALSE, 0);
 
-  GtkWidget* change_proxies_button = gtk_button_new_with_label(
+  change_proxies_button_ = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(
           IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON).c_str());
-  g_signal_connect(change_proxies_button, "clicked",
+  g_signal_connect(change_proxies_button_, "clicked",
                    G_CALLBACK(OnChangeProxiesButtonClicked), this);
 
   // Stick it in an hbox so it doesn't expand to the whole width.
   GtkWidget* button_hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(button_hbox),
-                     change_proxies_button,
+                     change_proxies_button_,
                      FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(page_),
                      gtk_util::IndentWidget(button_hbox),
                      FALSE, FALSE, 0);
+
+  proxy_prefs_.reset(PrefSetObserver::CreateProxyPrefSetObserver(
+      profile->GetPrefs(), this));
+  NotifyPrefChanged(NULL);
+}
+
+void NetworkSection::NotifyPrefChanged(const std::wstring* pref_name) {
+  if (!pref_name || proxy_prefs_->IsObserved(*pref_name))
+    gtk_widget_set_sensitive(change_proxies_button_,
+                             !proxy_prefs_->IsManaged());
 }
 
 // static
 void NetworkSection::OnChangeProxiesButtonClicked(GtkButton *button,
                                                   NetworkSection* section) {
   section->UserMetricsRecordAction(UserMetricsAction("Options_ChangeProxies"),
                                    NULL);
 
   scoped_ptr<base::EnvVarGetter> env_getter(base::EnvVarGetter::Create());
 
@@ skipping 828 matching lines @@
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT),
       web_content_section_->get_page_widget(), false);
 
   security_section_.reset(new SecuritySection(profile_));
   options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY),
       security_section_->get_page_widget(), false);
 
   page_ = options_builder->get_page_widget();
 }