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

Side by Side Diff: chrome/browser/chromeos/ui_proxy_config.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, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/ui_proxy_config.h" 5 #include "chrome/browser/chromeos/ui_proxy_config.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" 9 #include "components/proxy_config/proxy_config_dictionary.h"
10 #include "chrome/browser/prefs/proxy_config_dictionary.h"
11 #include "net/proxy/proxy_config.h" 10 #include "net/proxy/proxy_config.h"
12 11
13 namespace chromeos { 12 namespace chromeos {
14 13
15 UIProxyConfig::UIProxyConfig() 14 UIProxyConfig::UIProxyConfig()
16 : mode(MODE_DIRECT), 15 : mode(MODE_DIRECT),
17 state(ProxyPrefs::CONFIG_UNSET), 16 state(ProxyPrefs::CONFIG_UNSET),
18 user_modifiable(true) { 17 user_modifiable(true) {
19 } 18 }
20 19
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 *spec += ';'; 159 *spec += ';';
161 160
162 if (!url_scheme.empty()) { 161 if (!url_scheme.empty()) {
163 *spec += url_scheme; 162 *spec += url_scheme;
164 *spec += "="; 163 *spec += "=";
165 } 164 }
166 *spec += server.ToURI(); 165 *spec += server.ToURI();
167 } 166 }
168 167
169 } // namespace chromeos 168 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/ui_proxy_config.h ('k') | chrome/browser/extensions/api/proxy/proxy_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698