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

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl.cc

Issue 946533003: Fix proxy from user policy on shared networks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comment. Created 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/proxy_config_service_impl.cc
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index 9134736f0fcce5e196eeb9c19d6a90bece5cce70..8b59c5d3872c05245466d2f82a228a8e3bcd14dc 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -140,6 +140,13 @@ bool ProxyConfigServiceImpl::IgnoreProxy(const PrefService* profile_prefs,
VLOG(1) << "Respect proxy of not-shared networks.";
return false;
}
+ if (onc_source == ::onc::ONC_SOURCE_USER_POLICY) {
+ // Note that this case can occur if the network is shared (e.g. ethernet)
+ // but the proxy is determined by user policy.
+ // See https://crbug.com/454966 .
+ VLOG(1) << "Respect proxy from user policy although network is shared.";
+ return false;
+ }
if (onc_source == ::onc::ONC_SOURCE_DEVICE_POLICY) {
policy::BrowserPolicyConnectorChromeOS* connector =
g_browser_process->platform_part()->browser_policy_connector_chromeos();
« no previous file with comments | « no previous file | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698