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

chrome/browser/ui/webui/options/chromeos/proxy_handler.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/options/chromeos/proxy_handler.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/proxy_cros_settings_provider.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace chromeos {
 
-ProxyHandler::ProxyHandler()
-    : CrosOptionsPageUIHandler(new ProxyCrosSettingsProvider())  {
+ProxyHandler::ProxyHandler(Profile* profile)
+    : CrosOptionsPageUIHandler(new ProxyCrosSettingsProvider(profile))  {
 }
 
 ProxyHandler::~ProxyHandler() {
 }
 
 void ProxyHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   // Proxy page - ChromeOS
   localized_strings->SetString("proxyPage",
@@ skipping 25 matching lines @@
   localized_strings->SetString("advanced_proxy_config",
      l10n_util::GetStringUTF16(IDS_PROXY_ADVANCED_CONFIG));
   localized_strings->SetString("addHost",
      l10n_util::GetStringUTF16(IDS_PROXY_ADD_HOST));
   localized_strings->SetString("removeHost",
      l10n_util::GetStringUTF16(IDS_PROXY_REMOVE_HOST));
   localized_strings->SetString("proxyPort",
      l10n_util::GetStringUTF16(IDS_PROXY_PORT));
   localized_strings->SetString("proxyBypass",
      l10n_util::GetStringUTF16(IDS_PROXY_BYPASS));
+  localized_strings->SetString("policyManagedPrefsBannerText",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_POLICY_MANAGED_PREFS));
+  localized_strings->SetString("extensionManagedPrefsBannerText",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_EXTENSION_MANAGED_PREFS));
+  localized_strings->SetString("unmodifiablePrefsBannerText",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_UNMODIFIABLE_PREFS));
+  localized_strings->SetString("enableSharedProxiesBannerText",
+      l10n_util::GetStringFUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ENABLE_SHARED_PROXIES_HINT,
+          l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES)));
 }
 
 void ProxyHandler::SetNetworkName(const std::string& name) {
   StringValue network(name);
   web_ui_->CallJavascriptFunction("options.ProxyOptions.setNetworkName",
                                   network);
 }
 
 }  // namespace chromeos