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

chrome/browser/chromeos/preferences.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/chromeos/preferences.h"
 
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/histogram.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
-#include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/browser/chromeos/system/touchpad_settings.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "googleurl/src/gurl.h"
 #include "unicode/timezone.h"
 
 namespace chromeos {
 
 static const char kFallbackInputMethodLocale[] = "en-US";
 
 Preferences::Preferences() {}
 
 Preferences::~Preferences() {}
 
@@ skipping 148 matching lines @@
   // Mobile plan notifications default to on.
   prefs->RegisterBooleanPref(prefs::kShowPlanNotifications,
                              true,
                              PrefService::SYNCABLE_PREF);
 
   // 3G first-time usage promo will be shown at least once.
   prefs->RegisterBooleanPref(prefs::kShow3gPromoNotification,
                              true,
                              PrefService::UNSYNCABLE_PREF);
 
-  // Use shared proxies default to off.
-  prefs->RegisterBooleanPref(prefs::kUseSharedProxies,
-                             false,
-                             PrefService::SYNCABLE_PREF);
-
   // OAuth1 all access token and secret pair.
   prefs->RegisterStringPref(prefs::kOAuth1Token,
                             "",
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kOAuth1Secret,
                             "",
                             PrefService::UNSYNCABLE_PREF);
 }
 
 void Preferences::Init(PrefService* prefs) {
@@ skipping 55 matching lines @@
       prefs::kLanguageXkbRemapAltKeyTo, prefs, this);
   language_xkb_auto_repeat_enabled_.Init(
       prefs::kLanguageXkbAutoRepeatEnabled, prefs, this);
   language_xkb_auto_repeat_delay_pref_.Init(
       prefs::kLanguageXkbAutoRepeatDelay, prefs, this);
   language_xkb_auto_repeat_interval_pref_.Init(
       prefs::kLanguageXkbAutoRepeatInterval, prefs, this);
 
   enable_screen_lock_.Init(prefs::kEnableScreenLock, prefs, this);
 
-  use_shared_proxies_.Init(prefs::kUseSharedProxies, prefs, this);
-
   // Initialize preferences to currently saved state.
   NotifyPrefChanged(NULL);
 
   // Initialize virtual keyboard settings to currently saved state.
   UpdateVirturalKeyboardPreference(prefs);
 
   // If a guest is logged in, initialize the prefs as if this is the first
   // login.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession)) {
     LoginUtils::Get()->SetFirstLoginPrefs(prefs);
@@ skipping 169 matching lines @@
           language_prefs::kMozcIntegerPrefs[i].ibus_config_name,
           language_mozc_integer_prefs_[i].GetValue());
     }
   }
 
   // Init or update power manager config.
   if (!pref_name || *pref_name == prefs::kEnableScreenLock) {
     CrosLibrary::Get()->GetPowerLibrary()->EnableScreenLock(
         enable_screen_lock_.GetValue());
   }
-
-  if (!pref_name || *pref_name == prefs::kUseSharedProxies) {
-    g_browser_process->chromeos_proxy_config_service_impl()->
-        UISetUseSharedProxies(use_shared_proxies_.GetValue());
-  }
 }
 
 void Preferences::SetLanguageConfigBoolean(const char* section,
                                            const char* name,
                                            bool value) {
   input_method::ImeConfigValue config;
   config.type = input_method::ImeConfigValue::kValueTypeBool;
   config.bool_value = value;
   input_method::InputMethodManager::GetInstance()->
       SetImeConfig(section, name, config);
@@ skipping 114 matching lines @@
 
   // Remove invalid prefs.
   DictionaryPrefUpdate updater(prefs, prefs::kLanguagePreferredVirtualKeyboard);
   DictionaryValue* pref_value = updater.Get();
   for (size_t i = 0; i < layouts_to_remove.size(); ++i) {
     pref_value->RemoveWithoutPathExpansion(layouts_to_remove[i], NULL);
   }
 }
 
 }  // namespace chromeos