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

Unified Diff: webrtc/base/proxyinfo.cc

Issue 2766063005: Revert of Removing HTTPS and SOCKS proxy server code. (Closed)
Patch Set: Merge with master Created 3 years, 9 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 | « webrtc/base/proxyinfo.h ('k') | webrtc/base/proxyserver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/proxyinfo.cc
diff --git a/webrtc/base/proxyinfo.h b/webrtc/base/proxyinfo.cc
similarity index 60%
copy from webrtc/base/proxyinfo.h
copy to webrtc/base/proxyinfo.cc
index cd5c3875dd9ccffa5eb07bee68ec921d982bd7e6..76c7708286ec79724780b4a64a3181c6abe9174e 100644
--- a/webrtc/base/proxyinfo.h
+++ b/webrtc/base/proxyinfo.cc
@@ -8,20 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_BASE_PROXYINFO_H__
-#define WEBRTC_BASE_PROXYINFO_H__
+#include "webrtc/base/proxyinfo.h"
namespace rtc {
-// TODO(deadbeef): Remove this; it's not used any more but it's referenced in
-// some places, including chromium.
-enum ProxyType {
- PROXY_NONE,
-};
+const char * ProxyToString(ProxyType proxy) {
+ const char * const PROXY_NAMES[] = { "none", "https", "socks5", "unknown" };
+ return PROXY_NAMES[proxy];
+}
-struct ProxyInfo {
-};
+ProxyInfo::ProxyInfo() : type(PROXY_NONE), autodetect(false) {
+}
+ProxyInfo::~ProxyInfo() = default;
} // namespace rtc
-
-#endif // WEBRTC_BASE_PROXYINFO_H__
« no previous file with comments | « webrtc/base/proxyinfo.h ('k') | webrtc/base/proxyserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698