chrome/browser/prefs/proxy_config_dictionary.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/prefs/proxy_config_dictionary.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: Addressed comments 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

Index: chrome/browser/prefs/proxy_config_dictionary.h

diff --git a/chrome/browser/prefs/proxy_config_dictionary.h b/chrome/browser/prefs/proxy_config_dictionary.h

index c05f18283f430243af964837c30bda25e98bac9b..3eeac12f2d582b633866e2f0467dbff32f41c442 100644

--- a/chrome/browser/prefs/proxy_config_dictionary.h

+++ b/chrome/browser/prefs/proxy_config_dictionary.h

@@ -31,13 +31,15 @@ class ProxyConfigDictionary {

bool GetMode(ProxyPrefs::ProxyMode* out) const;

bool GetPacUrl(std::string* out) const;

+ bool GetPacMandatory(bool* out) const;

bool GetProxyServer(std::string* out) const;

bool GetBypassList(std::string* out) const;

bool HasBypassList() const;

static DictionaryValue* CreateDirect();

static DictionaryValue* CreateAutoDetect();

- static DictionaryValue* CreatePacScript(const std::string& pac_url);

+ static DictionaryValue* CreatePacScript(const std::string& pac_url,

+ bool pac_mandatory);

static DictionaryValue* CreateFixedServers(

const std::string& proxy_server,

const std::string& bypass_list);

@@ -45,6 +47,7 @@ class ProxyConfigDictionary {

private:

static DictionaryValue* CreateDictionary(ProxyPrefs::ProxyMode mode,

const std::string& pac_url,

+ bool pac_mandatory,

const std::string& proxy_server,

const std::string& bypass_list);

« no previous file with comments | « chrome/browser/prefs/command_line_pref_store.cc ('k') | chrome/browser/prefs/proxy_config_dictionary.cc » ('j') | no next file with comments »