chrome/browser/extensions/extension_proxy_api_helpers.h - Issue 6871019: Enable (optional) blocking of webrequests in case a PAC script cannot be fetched or is invalid.

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_helpers.h

Issue 6871019: Enable (optional) blocking of webrequests in case a PAC script cannot be fetched or is invalid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 8 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/extensions/extension_proxy_api_constants.cc ('k') | chrome/browser/extensions/extension_proxy_api_helpers.cc » ('j') | chrome/browser/extensions/extension_proxy_api_helpers.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_proxy_api_helpers.h

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

index d1d67824504690c79677dea676cd3343093e3afc..11eb6b9d7ff9b3be6cd80b6a14810f55b85b7beb 100644

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

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

@@ -46,6 +46,9 @@ bool CreatePACScriptFromDataURL(

bool GetProxyModeFromExtensionPref(const DictionaryValue* proxy_config,

ProxyPrefs::ProxyMode* out,

std::string* error);

+bool GetPacMandatoryFromExtensionPref(const DictionaryValue* proxy_config,

+ bool* out,

+ std::string* error);

bool GetPacUrlFromExtensionPref(const DictionaryValue* proxy_config,

std::string* out,

std::string* error);

@@ -63,6 +66,7 @@ bool GetBypassListFromExtensionPref(const DictionaryValue* proxy_config,

// API) from the given parameters. Ownership is passed to the caller.

// Depending on the value of |mode_enum|, several of the strings may be empty.

DictionaryValue* CreateProxyConfigDict(ProxyPrefs::ProxyMode mode_enum,

+ bool pac_mandatory,

const std::string& pac_url,

const std::string& pac_data,

const std::string& proxy_rules_string,