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)
@@ -245,8 +245,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 +309,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)
@@ -546,6 +550,9 @@
 }
 
 void AdvancedOptionsHandler::SetupProxySettingsSection() {
+#if defined(OS_CHROMEOS)

[Mattias Nissler (ping if slow), 2011/10/19 19:27:36]

#if !defined(OS_CHROMEOS) and no return and #else

[kuan, 2011/10/20 00:41:11]

Done.

+  return;
+#else
   // Disable the button if proxy settings are managed by a sysadmin or
   // overridden by an extension.
   PrefService* pref_service = Profile::FromWebUI(web_ui_)->GetPrefs();
@@ -569,6 +576,7 @@
 
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetupProxySettingsSection", disabled, label);
+#endif  // defined(OS_CHROMEOS)
 }
 
 void AdvancedOptionsHandler::SetupSSLConfigSettings() {