Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2833)

Unified Diff: chrome/browser/extensions/extension_proxy_api.cc

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
Index: chrome/browser/extensions/extension_proxy_api.cc
diff --git a/chrome/browser/extensions/extension_proxy_api.cc b/chrome/browser/extensions/extension_proxy_api.cc
index ccf62bda0175b9bd691b2c1a2caf54d867fa9d92..ad9aae9e902b9dedaa675ecf3459f80cec7c240f 100644
--- a/chrome/browser/extensions/extension_proxy_api.cc
+++ b/chrome/browser/extensions/extension_proxy_api.cc
@@ -73,11 +73,14 @@ Value* ProxyPrefTransformer::ExtensionToBrowserPref(const Value* extension_pref,
// If a values has been passed to set but could not be parsed, we bail
// out and return NULL.
ProxyPrefs::ProxyMode mode_enum;
+ bool pac_mandatory;
std::string pac_url;
std::string pac_data;
std::string proxy_rules_string;
std::string bypass_list;
if (!helpers::GetProxyModeFromExtensionPref(config, &mode_enum, error) ||
+ !helpers::GetPacMandatoryFromExtensionPref(config, &pac_mandatory,
+ error) ||
!helpers::GetPacUrlFromExtensionPref(config, &pac_url, error) ||
!helpers::GetPacDataFromExtensionPref(config, &pac_data, error) ||
!helpers::GetProxyRulesStringFromExtensionPref(
@@ -87,7 +90,8 @@ Value* ProxyPrefTransformer::ExtensionToBrowserPref(const Value* extension_pref,
}
return helpers::CreateProxyConfigDict(
- mode_enum, pac_url, pac_data, proxy_rules_string, bypass_list, error);
+ mode_enum, pac_mandatory, pac_url, pac_data, proxy_rules_string,
+ bypass_list, error);
}
Value* ProxyPrefTransformer::BrowserToExtensionPref(const Value* browser_pref) {

Powered by Google App Engine
This is Rietveld 408576698