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

Unified Diff: net/proxy/proxy_service.cc

Issue 8373014: Add new text for indicating we are resolving hosts during proxy resolution. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address eroman's nits. Created 9 years, 1 month 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_service.h ('k') | net/proxy/sync_host_resolver_bridge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_service.cc
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 41ba41d853f3da8a64c44339832c4aa8768cf4a0..892d0f74ba61f2d24a28321c279c52b442d1e481 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -118,6 +118,17 @@ class ProxyResolverNull : public ProxyResolver {
NOTREACHED();
}
+ virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE {
+ NOTREACHED();
+ return LOAD_STATE_IDLE;
+ }
+
+ virtual LoadState GetLoadStateThreadSafe(
+ RequestHandle request) const OVERRIDE {
+ NOTREACHED();
+ return LOAD_STATE_IDLE;
+ }
+
virtual void CancelSetPacScript() OVERRIDE {
NOTREACHED();
}
@@ -150,6 +161,17 @@ class ProxyResolverFromPacString : public ProxyResolver {
NOTREACHED();
}
+ virtual LoadState GetLoadState(RequestHandle request) const OVERRIDE {
+ NOTREACHED();
+ return LOAD_STATE_IDLE;
+ }
+
+ virtual LoadState GetLoadStateThreadSafe(
+ RequestHandle request) const OVERRIDE {
+ NOTREACHED();
+ return LOAD_STATE_IDLE;
+ }
+
virtual void CancelSetPacScript() OVERRIDE {
NOTREACHED();
}
@@ -382,6 +404,12 @@ class ProxyService::PacRequest
BoundNetLog* net_log() { return &net_log_; }
+ LoadState GetLoadState() const {
+ if (is_started())
+ return resolver()->GetLoadState(resolve_job_);
+ return LOAD_STATE_RESOLVING_PROXY_FOR_URL;
+ }
+
private:
friend class base::RefCounted<ProxyService::PacRequest>;
@@ -779,6 +807,11 @@ void ProxyService::CancelPacRequest(PacRequest* req) {
RemovePendingRequest(req);
}
+LoadState ProxyService::GetLoadState(const PacRequest* req) const {
+ CHECK(req);
+ return req->GetLoadState();
+}
+
bool ProxyService::ContainsPendingRequest(PacRequest* req) {
PendingRequests::iterator it = std::find(
pending_requests_.begin(), pending_requests_.end(), req);
« no previous file with comments | « net/proxy/proxy_service.h ('k') | net/proxy/sync_host_resolver_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698