chrome/browser/prefs/browser_prefs.cc - Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prefs/browser_prefs.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

« chrome/browser/net/proxy_service_factory.cc ('K') | « chrome/browser/net/ssl_config_service_manager_pref_unittest.cc ('k') | chrome/browser/prefs/proxy_prefs.h » ('j') | chrome/browser/ui/webui/options/advanced_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/browser_prefs.cc

===================================================================

--- chrome/browser/prefs/browser_prefs.cc (revision 106059)

+++ chrome/browser/prefs/browser_prefs.cc (working copy)

@@ -27,7 +27,7 @@

#include "chrome/browser/net/http_server_properties_manager.h"

#include "chrome/browser/net/net_pref_observer.h"

#include "chrome/browser/net/predictor.h"

-#include "chrome/browser/net/pref_proxy_config_service.h"

+#include "chrome/browser/net/pref_proxy_config_tracker.h"

#include "chrome/browser/net/ssl_config_service_manager.h"

#include "chrome/browser/notifications/desktop_notification_service.h"

#include "chrome/browser/notifications/notification_ui_manager.h"

@@ -118,7 +118,7 @@

geolocation::RegisterPrefs(local_state);

BackgroundModeManager::RegisterPrefs(local_state);

NotificationUIManager::RegisterPrefs(local_state);

- PrefProxyConfigService::RegisterPrefs(local_state);

+ PrefProxyConfigTracker::RegisterPrefs(local_state);

SSLConfigServiceManager::RegisterPrefs(local_state);

#if defined(ENABLE_CONFIGURATION_POLICY)

policy::CloudPolicySubsystem::RegisterPrefs(local_state);

@@ -162,7 +162,7 @@

PinnedTabCodec::RegisterUserPrefs(user_prefs);

ExtensionPrefs::RegisterUserPrefs(user_prefs);

TranslatePrefs::RegisterUserPrefs(user_prefs);

- PrefProxyConfigService::RegisterPrefs(user_prefs);

+ PrefProxyConfigTracker::RegisterPrefs(user_prefs);

#if defined(TOOLKIT_VIEWS)

BrowserActionsContainer::RegisterUserPrefs(user_prefs);

#elif defined(TOOLKIT_GTK)