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

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

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_
 #pragma once
 
 #include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/prefs/pref_set_observer.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 
+#if !defined(OS_CHROMEOS)
+#include "chrome/browser/prefs/pref_set_observer.h"
+#endif  // !defined(OS_CHROMEOS)
+
 class CloudPrintSetupHandler;
 
 // Chrome advanced options page UI handler.
 class AdvancedOptionsHandler
     : public OptionsPageUIHandler,
       public SelectFileDialog::Listener,
       public CloudPrintSetupHandlerDelegate {
  public:
   AdvancedOptionsHandler();
   virtual ~AdvancedOptionsHandler();
@@ skipping 99 matching lines @@
   void SetupMetricsReportingCheckbox();
 
   // Setup the visibility for the metrics reporting setting.
   void SetupMetricsReportingSettingVisibility();
 
   void SetupFontSizeLabel();
 
   // Setup the enabled state of the reset button.
   void SetupAutoOpenFileTypesDisabledAttribute();
 
+#if !defined(OS_CHROMEOS)
   // Setup the proxy settings section UI.
   void SetupProxySettingsSection();
+#endif  // !defined(OS_CHROMEOS)
 
   // Setup the checked state for SSL related checkboxes.
   void SetupSSLConfigSettings();
 
   scoped_refptr<SelectFileDialog> select_folder_dialog_;
 
 #if !defined(OS_CHROMEOS)
   BooleanPrefMember enable_metrics_recording_;
   StringPrefMember cloud_print_proxy_email_;
   BooleanPrefMember cloud_print_proxy_enabled_;
   bool cloud_print_proxy_ui_enabled_;
   scoped_ptr<CloudPrintSetupHandler> cloud_print_setup_handler_;
 #endif
 
   // SSLConfigService prefs.
   BooleanPrefMember rev_checking_enabled_;
 
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
   BooleanPrefMember background_mode_enabled_;
 #endif
 
   StringPrefMember auto_open_files_;
   IntegerPrefMember default_font_size_;
+
+#if !defined(OS_CHROMEOS)
   scoped_ptr<PrefSetObserver> proxy_prefs_;
+#endif  // !defined(OS_CHROMEOS)
 
   DISALLOW_COPY_AND_ASSIGN(AdvancedOptionsHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_ADVANCED_OPTIONS_HANDLER_H_