Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1629)

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/preferences.cc
===================================================================
--- chrome/browser/chromeos/preferences.cc (revision 107101)
+++ chrome/browser/chromeos/preferences.cc (working copy)
@@ -17,7 +17,6 @@
#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"
@@ -25,8 +24,10 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
+#include "content/browser/browser_thread.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 {
@@ -195,11 +196,6 @@
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,
"",
@@ -275,8 +271,6 @@
enable_screen_lock_.Init(prefs::kEnableScreenLock, prefs, this);
- use_shared_proxies_.Init(prefs::kUseSharedProxies, prefs, this);
-
// Initialize preferences to currently saved state.
NotifyPrefChanged(NULL);
@@ -466,11 +460,6 @@
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,

Powered by Google App Engine
This is Rietveld 408576698