redesign and reimplement proxy config service and tracker, revise proxy ui on cros

chrome/browser/ui/webui/options/advanced_options_handler.cc

Index: chrome/browser/ui/webui/options/advanced_options_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/advanced_options_handler.cc	(revision 106059)
+++ chrome/browser/ui/webui/options/advanced_options_handler.cc	(working copy)
@@ -203,7 +203,9 @@
   SetupMetricsReportingSettingVisibility();
   SetupFontSizeLabel();
   SetupAutoOpenFileTypesDisabledAttribute();
+#if !defined(OS_CHROMEOS)
   SetupProxySettingsSection();
+#endif  // !defined(OS_CHROMEOS)
   SetupSSLConfigSettings();
 #if !defined(OS_CHROMEOS)
   if (cloud_print_proxy_ui_enabled_) {
@@ -245,8 +247,10 @@
 
   auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this);
   default_font_size_.Init(prefs::kWebKitDefaultFontSize, prefs, this);
+#if !defined(OS_CHROMEOS)
   proxy_prefs_.reset(
       PrefSetObserver::CreateProxyPrefSetObserver(prefs, this));
+#endif  // !defined(OS_CHROMEOS)
 
   // Return result from the superclass.
   return handler;
@@ -307,8 +311,10 @@
     std::string* pref_name = Details<std::string>(details).ptr();
     if (*pref_name == prefs::kDownloadExtensionsToOpen) {
       SetupAutoOpenFileTypesDisabledAttribute();
+#if !defined(OS_CHROMEOS)
     } else if (proxy_prefs_->IsObserved(*pref_name)) {
       SetupProxySettingsSection();
+#endif  // !defined(OS_CHROMEOS)
     } else if ((*pref_name == prefs::kCloudPrintEmail) ||
                (*pref_name == prefs::kCloudPrintProxyEnabled)) {
 #if !defined(OS_CHROMEOS)
@@ -545,6 +551,7 @@
       "options.AdvancedOptions.SetAutoOpenFileTypesDisabledAttribute", value);
 }
 
+#if !defined(OS_CHROMEOS)
 void AdvancedOptionsHandler::SetupProxySettingsSection() {
   // Disable the button if proxy settings are managed by a sysadmin or

[xiyuan, 2011/10/18 17:33:31]

Can we use the following here?
#if defined(OS_CHROMEOS)
  return;
#else
....
#endif

This way, we can reduce the number of "#if !defined(OS_CHROMEOS)".

[kuan, 2011/10/18 20:32:47]

Done.

   // overridden by an extension.
@@ -570,6 +577,7 @@
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetupProxySettingsSection", disabled, label);
 }
+#endif  // !defined(OS_CHROMEOS)
 
 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
   {