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

chrome/browser/io_thread.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_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 #pragma once
 
 #include <string>
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
 class ExtensionEventRouterForwarder;
 class MediaInternals;
 class PrefProxyConfigTracker;
 class PrefService;
 class SystemURLRequestContextGetter;
 
 namespace base {
 class ListValue;
 }
 
+#if defined(OS_CHROMEOS)
+namespace chromeos {
+class ProxyConfigServiceImpl;
+}
+#endif  // defined(OS_CHROMEOS)
+
 namespace net {
 class CertVerifier;
 class CookieStore;
 class DnsRRResolver;
 class FtpTransactionFactory;
 class HostResolver;
 class HttpAuthHandlerFactory;
 class HttpServerProperties;
 class HttpTransactionFactory;
 class NetworkDelegate;
@@ skipping 129 matching lines @@
   std::string gssapi_library_name_;
 
   // This is an instance of the default SSLConfigServiceManager for the current
   // platform and it gets SSL preferences from local_state object.
   scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
 
   // These member variables are initialized by a task posted to the IO thread,
   // which gets posted by calling certain member functions of IOThread.
   scoped_ptr<net::ProxyConfigService> system_proxy_config_service_;
 
-  scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+#if defined(OS_CHROMEOS)
+  scoped_ptr<chromeos::ProxyConfigServiceImpl> pref_proxy_config_tracker_;
+#else
+  scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
+#endif  // defined(OS_CHROMEOS)
 
   scoped_refptr<net::URLRequestContextGetter>
       system_url_request_context_getter_;
 
   net::SdchManager* sdch_manager_;
 
   ScopedRunnableMethodFactory<IOThread> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_