chrome/browser/extensions/extension_proxy_api.h - Issue 6240013: Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic.

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/extensions/extension_proxy_api.h

Issue 6240013: Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/out/Debug

Patch Set: Updated to ToT and addressed Matt's comments in base-CL Created 9 years, 11 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

« no previous file with comments | « chrome/browser/dom_ui/options/advanced_options_handler.cc ('k') | chrome/browser/extensions/extension_proxy_api.cc » ('j') | chrome/browser/extensions/extension_proxy_apitest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_proxy_api.h

diff --git a/chrome/browser/extensions/extension_proxy_api.h b/chrome/browser/extensions/extension_proxy_api.h

index 8ac47966b10df6e58439faaa2f18cc9d95e3b5dd..13600c843f12157bce7d9994203e5e984e7dfde8 100644

--- a/chrome/browser/extensions/extension_proxy_api.h

+++ b/chrome/browser/extensions/extension_proxy_api.h

@@ -43,10 +43,7 @@ class UseCustomProxySettingsFunction : public ProxySettingsFunction {

};

bool GetProxyServer(const DictionaryValue* dict, ProxyServer* proxy_server);

- bool ApplyMode(const std::string& mode, bool incognito);

- bool ApplyPacScript(DictionaryValue* pac_dict, bool incognito);

- bool ApplyProxyRules(DictionaryValue* proxy_rules, bool incognito);

+ bool GetProxyRules(DictionaryValue* proxy_rules, std::string* out);

danno 2011/02/04 10:32:13 Ad bit of documentation would actually help here.

battre 2011/02/07 14:13:47 Done.

};

class RemoveCustomProxySettingsFunction : public ProxySettingsFunction {