dom-ui options: Setup proxy settings UI accordingly if an Extension is managi...

chrome/browser/dom_ui/advanced_options_handler.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/dom_ui/advanced_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/utf_string_conversions.h"
@@ skipping 109 matching lines @@
       l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE));
   localized_strings->SetString("enableLogging",
       l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_LOGGING));
   localized_strings->SetString("disableServices",
       l10n_util::GetStringUTF16(IDS_OPTIONS_DISABLE_SERVICES));
 }
 
 void AdvancedOptionsHandler::Initialize() {
   SetupDownloadLocationPath();
   SetupAutoOpenFileTypesDisabledAttribute();
-  SetupProxySettingsDisabledAttribute();
+  SetupProxySettingsSection();
 #if defined(OS_WIN)
   SetupSSLConfigSettings();
 #endif
   banner_handler_.reset(
       new OptionsManagedBannerHandler(dom_ui_,
                                       ASCIIToUTF16("AdvancedOptions"),
                                       OPTIONS_PAGE_ADVANCED));
 }
 
 DOMMessageHandler* AdvancedOptionsHandler::Attach(DOMUI* dom_ui) {
@@ skipping 45 matching lines @@
 
 void AdvancedOptionsHandler::Observe(NotificationType type,
                                      const NotificationSource& source,
                                      const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     std::string* pref_name = Details<std::string>(details).ptr();
     if (*pref_name == prefs::kDownloadDefaultDirectory) {
       SetupDownloadLocationPath();
     } else if (*pref_name == prefs::kDownloadExtensionsToOpen) {
       SetupAutoOpenFileTypesDisabledAttribute();
+    } else {
+      // Assume that one of the proxy settings may have changed.
+      SetupProxySettingsSection();
     }
   }
 }
 
 void AdvancedOptionsHandler::HandleSelectDownloadLocation(
     const ListValue* args) {
   PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs();
   select_folder_dialog_ = SelectFileDialog::Create(this);
   select_folder_dialog_->SelectFile(
       SelectFileDialog::SELECT_FOLDER,
@@ skipping 54 matching lines @@
   // Set the enabled state for the AutoOpenFileTypesResetToDefault button.
   // We enable the button if the user has any auto-open file types registered.
   DCHECK(dom_ui_);
   DownloadManager* manager = dom_ui_->GetProfile()->GetDownloadManager();
   bool disabled = !(manager && manager->HasAutoOpenFileTypesRegistered());
   FundamentalValue value(disabled);
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetAutoOpenFileTypesDisabledAttribute", value);
 }
 
-void AdvancedOptionsHandler::SetupProxySettingsDisabledAttribute() {
-  // Set the enabled state for the proxy settings button.
-  // We enable the button if proxy settings are not managed by a sysadmin.
-  FundamentalValue value(proxy_prefs_->IsManaged());
+void AdvancedOptionsHandler::SetupProxySettingsSection() {
+  // Disable the button if proxy settings are managed by a sysadmin or
+  // overridden by an extension.
+  PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs();
+  const PrefService::Preference* proxy_server =
+      pref_service->FindPreference(prefs::kProxyServer);
+  CHECK(proxy_server);

[James Hawkins, 2010/08/20 19:51:41]

If you really want to check here, this should be a DCHECK. CHECKs should only be
used to track down crashes in the wild.

[csilv, 2010/08/20 20:21:42]

Done.

+
+  FundamentalValue disabled(proxy_prefs_->IsManaged() ||
+                            proxy_server->IsExtensionControlled());
+
+  // Get the appropriate info string to describe the button.
+  string16 label_str;
+  if (proxy_server->IsExtensionControlled()) {
+    label_str = l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_PROXIES_LABEL);
+  } else {
+    label_str = l10n_util::GetStringFUTF16(IDS_OPTIONS_SYSTEM_PROXIES_LABEL,
+        l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+  }
+  StringValue label(label_str);
+
   dom_ui_->CallJavascriptFunction(
-      L"options.AdvancedOptions.SetProxySettingsDisabledAttribute", value);
+      L"options.AdvancedOptions.SetupProxySettingsSection", disabled, label);
 }
 
 #if defined(OS_WIN)
 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
   DCHECK(dom_ui_);
   bool checkRevocationSetting = false;
   bool useSSLSetting = false;
 
   net::SSLConfig config;
   if (net::SSLConfigServiceWin::GetSSLConfigNow(&config)) {
     checkRevocationSetting = config.rev_checking_enabled;
     useSSLSetting = config.ssl2_enabled;
   }
   FundamentalValue checkRevocationValue(checkRevocationSetting);
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetCheckRevocationCheckboxState",
       checkRevocationValue);
   FundamentalValue useSSLValue(useSSLSetting);
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetUseSSL2CheckboxStatechecked", useSSLValue);
 }
 #endif