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

Unified Diff: chrome/browser/prefs/proxy_config_dictionary.cc

Issue 1221033002: Add proxy_config component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update copyrights Created 5 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
Index: chrome/browser/prefs/proxy_config_dictionary.cc
diff --git a/chrome/browser/prefs/proxy_config_dictionary.cc b/chrome/browser/prefs/proxy_config_dictionary.cc
deleted file mode 100644
index 85852ea9f9d1da7498684101119af328b81438c0..0000000000000000000000000000000000000000
--- a/chrome/browser/prefs/proxy_config_dictionary.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/prefs/proxy_config_dictionary.h"
-
-#include "base/basictypes.h"
-#include "base/logging.h"
-#include "base/values.h"
-
-namespace {
-
-// Integer to specify the type of proxy settings.
-// See ProxyPrefs for possible values and interactions with the other proxy
-// preferences.
-const char kProxyMode[] = "mode";
-// String specifying the proxy server. For a specification of the expected
-// syntax see net::ProxyConfig::ProxyRules::ParseFromString().
-const char kProxyServer[] = "server";
-// URL to the proxy .pac file.
-const char kProxyPacUrl[] = "pac_url";
-// Optional boolean flag indicating whether a valid PAC script is mandatory.
-// If true, network traffic does not fall back to direct connections in case the
-// PAC script is not available.
-const char kProxyPacMandatory[] = "pac_mandatory";
-// String containing proxy bypass rules. For a specification of the
-// expected syntax see net::ProxyBypassRules::ParseFromString().
-const char kProxyBypassList[] = "bypass_list";
-
-} // namespace
-
-ProxyConfigDictionary::ProxyConfigDictionary(const base::DictionaryValue* dict)
- : dict_(dict->DeepCopy()) {
-}
-
-ProxyConfigDictionary::~ProxyConfigDictionary() {}
-
-bool ProxyConfigDictionary::GetMode(ProxyPrefs::ProxyMode* out) const {
- std::string mode_str;
- return dict_->GetString(kProxyMode, &mode_str)
- && StringToProxyMode(mode_str, out);
-}
-
-bool ProxyConfigDictionary::GetPacUrl(std::string* out) const {
- return dict_->GetString(kProxyPacUrl, out);
-}
-
-bool ProxyConfigDictionary::GetPacMandatory(bool* out) const {
- if (!dict_->HasKey(kProxyPacMandatory)) {
- *out = false;
- return true;
- }
- return dict_->GetBoolean(kProxyPacMandatory, out);
-}
-
-bool ProxyConfigDictionary::GetProxyServer(std::string* out) const {
- return dict_->GetString(kProxyServer, out);
-}
-
-bool ProxyConfigDictionary::GetBypassList(std::string* out) const {
- return dict_->GetString(kProxyBypassList, out);
-}
-
-bool ProxyConfigDictionary::HasBypassList() const {
- return dict_->HasKey(kProxyBypassList);
-}
-
-const base::DictionaryValue& ProxyConfigDictionary::GetDictionary() const {
- return *dict_;
-}
-
-// static
-base::DictionaryValue* ProxyConfigDictionary::CreateDirect() {
- return CreateDictionary(ProxyPrefs::MODE_DIRECT,
- std::string(),
- false,
- std::string(),
- std::string());
-}
-
-// static
-base::DictionaryValue* ProxyConfigDictionary::CreateAutoDetect() {
- return CreateDictionary(ProxyPrefs::MODE_AUTO_DETECT,
- std::string(),
- false,
- std::string(),
- std::string());
-}
-
-// static
-base::DictionaryValue* ProxyConfigDictionary::CreatePacScript(
- const std::string& pac_url,
- bool pac_mandatory) {
- return CreateDictionary(ProxyPrefs::MODE_PAC_SCRIPT,
- pac_url,
- pac_mandatory,
- std::string(),
- std::string());
-}
-
-// static
-base::DictionaryValue* ProxyConfigDictionary::CreateFixedServers(
- const std::string& proxy_server,
- const std::string& bypass_list) {
- if (!proxy_server.empty()) {
- return CreateDictionary(ProxyPrefs::MODE_FIXED_SERVERS,
- std::string(),
- false,
- proxy_server,
- bypass_list);
- } else {
- return CreateDirect();
- }
-}
-
-// static
-base::DictionaryValue* ProxyConfigDictionary::CreateSystem() {
- return CreateDictionary(ProxyPrefs::MODE_SYSTEM,
- std::string(),
- false,
- std::string(),
- std::string());
-}
-
-// static
-base::DictionaryValue* ProxyConfigDictionary::CreateDictionary(
- ProxyPrefs::ProxyMode mode,
- const std::string& pac_url,
- bool pac_mandatory,
- const std::string& proxy_server,
- const std::string& bypass_list) {
- base::DictionaryValue* dict = new base::DictionaryValue();
- dict->SetString(kProxyMode, ProxyModeToString(mode));
- if (!pac_url.empty()) {
- dict->SetString(kProxyPacUrl, pac_url);
- dict->SetBoolean(kProxyPacMandatory, pac_mandatory);
- }
- if (!proxy_server.empty())
- dict->SetString(kProxyServer, proxy_server);
- if (!bypass_list.empty())
- dict->SetString(kProxyBypassList, bypass_list);
- return dict;
-}
« no previous file with comments | « chrome/browser/prefs/proxy_config_dictionary.h ('k') | chrome/browser/prefs/proxy_config_dictionary_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698