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

Unified Diff: net/proxy/proxy_info.cc

Issue 556034: Merge 37191 - Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/249/src/
Patch Set: Created 10 years, 11 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 | « net/proxy/proxy_info.h ('k') | net/proxy/proxy_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_info.cc
===================================================================
--- net/proxy/proxy_info.cc (revision 37198)
+++ net/proxy/proxy_info.cc (working copy)
@@ -6,9 +6,7 @@
namespace net {
-ProxyInfo::ProxyInfo()
- : config_id_(ProxyConfig::INVALID_ID),
- config_was_tried_(false) {
+ProxyInfo::ProxyInfo() : config_id_(ProxyConfig::INVALID_ID) {
}
void ProxyInfo::Use(const ProxyInfo& other) {
@@ -16,7 +14,7 @@
}
void ProxyInfo::UseDirect() {
- proxy_list_.Set(std::string());
+ proxy_list_.SetSingleProxyServer(ProxyServer::Direct());
}
void ProxyInfo::UseNamedProxy(const std::string& proxy_uri_list) {
Property changes on: net\proxy\proxy_info.cc
___________________________________________________________________
Deleted: svn:mergeinfo
Reverse-merged /branches/chrome_webkit_merge_branch/net/proxy/proxy_service.cc:r69-2775
« no previous file with comments | « net/proxy/proxy_info.h ('k') | net/proxy/proxy_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698