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

Side by Side 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, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/policy/policy_prefs_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h" 5 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 9 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 data = base::Value::CreateIntegerValue(3); 317 data = base::Value::CreateIntegerValue(3);
318 } else if (config.mode == 318 } else if (config.mode ==
319 chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY || 319 chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY ||
320 config.mode == 320 config.mode ==
321 chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PROXY_PER_SCHEME) { 321 chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_PROXY_PER_SCHEME) {
322 data = base::Value::CreateIntegerValue(2); 322 data = base::Value::CreateIntegerValue(2);
323 } else { 323 } else {
324 data = base::Value::CreateIntegerValue(1); 324 data = base::Value::CreateIntegerValue(1);
325 } 325 }
326 switch (config.state) { 326 switch (config.state) {
327 case ProxyPrefs::CONFIG_POLICY: 327 case ProxyPrefs::CONFIG_POLICY:
328 controlled_by = "policyManagedPrefsBannerText"; 328 controlled_by = "policy";
329 break; 329 break;
330 case ProxyPrefs::CONFIG_EXTENSION: 330 case ProxyPrefs::CONFIG_EXTENSION:
331 controlled_by = "extensionManagedPrefsBannerText"; 331 controlled_by = "extension";
332 break; 332 break;
333 case ProxyPrefs::CONFIG_OTHER_PRECEDE: 333 case ProxyPrefs::CONFIG_OTHER_PRECEDE:
334 controlled_by = "unmodifiablePrefsBannerText"; 334 controlled_by = "other";
335 break; 335 break;
336 default: 336 default:
337 if (!config.user_modifiable) 337 if (!config.user_modifiable)
338 controlled_by = "enableSharedProxiesBannerText"; 338 controlled_by = "shared";
339 break; 339 break;
340 } 340 }
341 } else if (path == kProxySingle) { 341 } else if (path == kProxySingle) {
342 data = base::Value::CreateBooleanValue(config.mode == 342 data = base::Value::CreateBooleanValue(config.mode ==
343 chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY); 343 chromeos::ProxyConfigServiceImpl::ProxyConfig::MODE_SINGLE_PROXY);
344 } else if (path == kProxyFtpUrl) { 344 } else if (path == kProxyFtpUrl) {
345 data = CreateServerHostValue(config.ftp_proxy); 345 data = CreateServerHostValue(config.ftp_proxy);
346 } else if (path == kProxySocks) { 346 } else if (path == kProxySocks) {
347 data = CreateServerHostValue(config.socks_proxy); 347 data = CreateServerHostValue(config.socks_proxy);
348 } else if (path == kProxyHttpPort) { 348 } else if (path == kProxyHttpPort) {
349 data = CreateServerPortValue(config.http_proxy); 349 data = CreateServerPortValue(config.http_proxy);
(...skipping 26 matching lines...) Expand all
376 } else { 376 } else {
377 dict->SetBoolean("disabled", false); 377 dict->SetBoolean("disabled", false);
378 } 378 }
379 *out_value = dict; 379 *out_value = dict;
380 return true; 380 return true;
381 } 381 }
382 382
383 } // namespace proxy_cros_settings_parser 383 } // namespace proxy_cros_settings_parser
384 384
385 } // namespace chromeos 385 } // namespace chromeos
OLDNEW
« 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