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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/net_error_list.h

Issue 552164: Merge 34903, 34928, 35008, 35549, 36054 to the 249s branch.... (Closed) Base URL: svn://chrome-svn/chrome/branches/249s/src/
Patch Set: Fix some other merge conflicts 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 | « no previous file | net/http/http_network_transaction.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_error_list.h
===================================================================
--- net/base/net_error_list.h (revision 37149)
+++ net/base/net_error_list.h (working copy)
@@ -288,6 +288,9 @@
// Attempted use of an unknown FLIP stream id.
NET_ERROR(INVALID_FLIP_STREAM, -335)
+// There are no supported proxies in the provided list.
+NET_ERROR(NO_SUPPORTED_PROXIES, -336)
+
// The cache does not have the requested entry.
NET_ERROR(CACHE_MISS, -400)
« no previous file with comments | « no previous file | net/http/http_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698