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

chrome/browser/profiles/off_the_record_profile_impl.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_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
 #define CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_
 #pragma once
 
 #include <string>
 
@@ skipping 106 matching lines @@
   virtual ExtensionInfoMap* GetExtensionInfoMap() OVERRIDE;
   virtual ChromeURLDataManager* GetChromeURLDataManager() OVERRIDE;
   virtual PromoCounter* GetInstantPromoCounter() OVERRIDE;
 
 #if defined(OS_CHROMEOS)
   virtual void ChangeAppLocale(const std::string& locale,
                                AppLocaleChangedVia) OVERRIDE;
   virtual void OnLogin() OVERRIDE;
 #endif  // defined(OS_CHROMEOS)
 
+#if defined(OS_CHROMEOS)
+  virtual chromeos::ProxyConfigServiceImpl* GetProxyConfigTracker() OVERRIDE;
+#else
   virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;
+#endif  // defined(OS_CHROMEOS)
+
   virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
   virtual void ClearNetworkingHistorySince(base::Time time) OVERRIDE;
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
  private:
   void CreateQuotaManagerAndClients();
@@ skipping 37 matching lines @@
   // Should be used only on the file thread.
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
 
   FilePath last_selected_directory_;
 
   scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
 
   // The file_system context for this profile.
   scoped_refptr<fileapi::FileSystemContext> file_system_context_;
 
-  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_ptr<ChromeURLDataManager> chrome_url_data_manager_;
 
   scoped_refptr<quota::QuotaManager> quota_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_OFF_THE_RECORD_PROFILE_IMPL_H_