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

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

Issue 11272026: Remove the managed banner from the Chrome settings UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 years, 2 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/app/generated_resources.grd ('k') | chrome/browser/policy/policy_prefs_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/proxy_cros_settings_parser.cc
diff --git a/chrome/browser/chromeos/proxy_cros_settings_parser.cc b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
index 158db4e31260579671ba9369112d801765bb4de9..2177095abab29528781b3465515d30111d2e2457 100644
--- a/chrome/browser/chromeos/proxy_cros_settings_parser.cc
+++ b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
@@ -324,19 +324,19 @@ bool GetProxyPrefValue(Profile* profile,
data = base::Value::CreateIntegerValue(1);
}
switch (config.state) {
- case ProxyPrefs::CONFIG_POLICY:
- controlled_by = "policyManagedPrefsBannerText";
- break;
- case ProxyPrefs::CONFIG_EXTENSION:
- controlled_by = "extensionManagedPrefsBannerText";
- break;
- case ProxyPrefs::CONFIG_OTHER_PRECEDE:
- controlled_by = "unmodifiablePrefsBannerText";
- break;
- default:
- if (!config.user_modifiable)
- controlled_by = "enableSharedProxiesBannerText";
- break;
+ case ProxyPrefs::CONFIG_POLICY:
+ controlled_by = "policy";
+ break;
+ case ProxyPrefs::CONFIG_EXTENSION:
+ controlled_by = "extension";
+ break;
+ case ProxyPrefs::CONFIG_OTHER_PRECEDE:
+ controlled_by = "other";
+ break;
+ default:
+ if (!config.user_modifiable)
+ controlled_by = "shared";
+ break;
}
} else if (path == kProxySingle) {
data = base::Value::CreateBooleanValue(config.mode ==
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/policy/policy_prefs_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698