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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 17408009: Fix bug preventing supervised users from changing proxy settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/browser_options_handler.cc (revision 207238)
+++ chrome/browser/ui/webui/options/browser_options_handler.cc (working copy)
@@ -1728,8 +1728,7 @@
bool is_extension_controlled = (proxy_config &&
proxy_config->IsExtensionControlled());
- base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() ||
- is_extension_controlled);
+ base::FundamentalValue disabled(!proxy_config->IsUserModifiable());
base::FundamentalValue extension_controlled(is_extension_controlled);
web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
disabled, extension_controlled);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698