Index: content/browser/loader/navigation_resource_throttle.cc |
diff --git a/content/browser/loader/navigation_resource_throttle.cc b/content/browser/loader/navigation_resource_throttle.cc |
index 44fd0c131ff413fd0d90d0d4c07adae7dedc338b..75b892e63de7822384f99356692adfe32290d957 100644 |
--- a/content/browser/loader/navigation_resource_throttle.cc |
+++ b/content/browser/loader/navigation_resource_throttle.cc |
@@ -92,7 +92,8 @@ void CheckWillRedirectRequestOnUIThread( |
base::Bind(&SendCheckResultToIOThread, callback)); |
} |
-void WillProcessResponseOnUIThread( |
+void CheckWillProcessResponseOnUIThread( |
+ UIChecksPerformedCallback callback, |
int render_process_id, |
int render_frame_host_id, |
scoped_refptr<net::HttpResponseHeaders> headers) { |
@@ -107,7 +108,9 @@ void WillProcessResponseOnUIThread( |
if (!navigation_handle) |
return; |
- navigation_handle->ReadyToCommitNavigation(render_frame_host, headers); |
+ navigation_handle->WillProcessResponse( |
+ render_frame_host, headers, |
+ base::Bind(&SendCheckResultToIOThread, callback)); |
} |
} // namespace |
@@ -204,10 +207,15 @@ void NavigationResourceThrottle::WillProcessResponse(bool* defer) { |
request_->response_headers()->raw_headers()); |
} |
+ UIChecksPerformedCallback callback = |
+ base::Bind(&NavigationResourceThrottle::OnUIChecksPerformed, |
+ weak_ptr_factory_.GetWeakPtr()); |
+ |
BrowserThread::PostTask( |
BrowserThread::UI, FROM_HERE, |
- base::Bind(&WillProcessResponseOnUIThread, render_process_id, |
- render_frame_id, response_headers)); |
+ base::Bind(&CheckWillProcessResponseOnUIThread, callback, |
+ render_process_id, render_frame_id, response_headers)); |
+ *defer = true; |
} |
const char* NavigationResourceThrottle::GetNameForLogging() const { |
@@ -221,6 +229,8 @@ void NavigationResourceThrottle::OnUIChecksPerformed( |
controller()->CancelAndIgnore(); |
} else if (result == NavigationThrottle::CANCEL) { |
controller()->Cancel(); |
+ } else if (result == NavigationThrottle::BLOCK) { |
+ controller()->CancelWithError(net::ERR_BLOCKED_BY_CLIENT); |
Mike West
2016/01/15 15:37:10
This is a bit of a hack. I need a mechanism by whi
clamy
2016/01/18 17:45:32
I'm less knowledgeable about the inner workings of
|
} else { |
controller()->Resume(); |
} |