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

chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/chromeos/proxy_settings_ui.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros_settings.h"
@@ skipping 48 matching lines @@
   SendResponse(request_id, base::RefCountedString::TakeString(&full_html));
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ProxySettingsUI::ProxySettingsUI(TabContents* contents)
     : ChromeWebUI(contents),
       proxy_settings_(NULL),
-      proxy_handler_(new ProxyHandler) {
+      proxy_handler_(new ProxyHandler(GetProfile())) {
   // |localized_strings| will be owned by ProxySettingsHTMLSource.
   DictionaryValue* localized_strings = new DictionaryValue();
 
   CoreChromeOSOptionsHandler* core_handler = new CoreChromeOSOptionsHandler();
   core_handler->set_handlers_host(this);
   core_handler->GetLocalizedValues(localized_strings);
   AddMessageHandler(core_handler->Attach(this));
 
   proxy_handler_->GetLocalizedValues(localized_strings);
   AddMessageHandler(proxy_handler_->Attach(this));
@@ skipping 16 matching lines @@
 }
 
 void ProxySettingsUI::InitializeHandlers() {
   std::vector<WebUIMessageHandler*>::iterator iter;
   // Skip over the generic handler.
   for (iter = handlers_.begin() + 1; iter != handlers_.end(); ++iter) {
     (static_cast<OptionsPageUIHandler*>(*iter))->Initialize();
   }
   if (proxy_settings()) {
     proxy_settings()->MakeActiveNetworkCurrent();
-    std::string network = proxy_settings()->GetCurrentNetworkName();
-    if (!network.empty())
-      proxy_handler_->SetNetworkName(network);
+    std::string network_name;
+    GetProfile()->GetProxyConfigTracker()->UIGetCurrentNetworkName(
+        &network_name);
+    proxy_handler_->SetNetworkName(network_name);
   }
 }
 
 chromeos::ProxyCrosSettingsProvider* ProxySettingsUI::proxy_settings() {
   if (!proxy_settings_) {
     proxy_settings_ = static_cast<chromeos::ProxyCrosSettingsProvider*>(
       chromeos::CrosSettings::Get()->GetProvider("cros.session.proxy"));
     if (!proxy_settings_)
       NOTREACHED() << "Error getting access to proxy cros settings provider";
   }
   return proxy_settings_;
 }
 
 }  // namespace chromeos