chrome/browser/profiles/profile.cc - Issue 6549007: Make CrOS proxy configuration write prefs directly.

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/profiles/profile.cc

Issue 6549007: Make CrOS proxy configuration write prefs directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix single proxy handling for real! Created 9 years, 10 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:

Index: chrome/browser/profiles/profile.cc

diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc

index 52944ffb95caf75c25adad5586acf52082eb6e25..d3ce20bc699b7ad9ffee8429ac658ff6e118d6fb 100644

--- a/chrome/browser/profiles/profile.cc

+++ b/chrome/browser/profiles/profile.cc

@@ -652,8 +652,11 @@ class OffTheRecordProfileImpl : public Profile,

#endif // defined(OS_CHROMEOS)

virtual PrefProxyConfigTracker* GetProxyConfigTracker() {

- if (!pref_proxy_config_tracker_)

- pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs());

+ if (!pref_proxy_config_tracker_) {

+ pref_proxy_config_tracker_ =

+ new PrefProxyConfigTracker(GetPrefs(),

+ g_browser_process->local_state());

+ }

return pref_proxy_config_tracker_;

}