| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h" | 5 #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chrome/browser/renderer_host/global_request_id.h" | 8 #include "chrome/browser/renderer_host/global_request_id.h" |
| 9 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" | 9 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
| 10 #include "chrome/browser/renderer_host/resource_message_filter.h" | 10 #include "chrome/browser/renderer_host/resource_message_filter.h" |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 SafeBrowsingService::UrlCheckResult result) { | 170 SafeBrowsingService::UrlCheckResult result) { |
| 171 CHECK(state_ == STATE_NONE); | 171 CHECK(state_ == STATE_NONE); |
| 172 CHECK(defer_state_ != DEFERRED_NONE); | 172 CHECK(defer_state_ != DEFERRED_NONE); |
| 173 CHECK(deferred_request_id_ != -1); | 173 CHECK(deferred_request_id_ != -1); |
| 174 | 174 |
| 175 state_ = STATE_DISPLAYING_BLOCKING_PAGE; | 175 state_ = STATE_DISPLAYING_BLOCKING_PAGE; |
| 176 AddRef(); // Balanced in OnBlockingPageComplete(). | 176 AddRef(); // Balanced in OnBlockingPageComplete(). |
| 177 | 177 |
| 178 // Grab the original url of this request as well. | 178 // Grab the original url of this request as well. |
| 179 GURL original_url; | 179 GURL original_url; |
| 180 URLRequest* request = rdh_->GetURLRequest( | 180 net::URLRequest* request = rdh_->GetURLRequest( |
| 181 GlobalRequestID(render_process_host_id_, deferred_request_id_)); | 181 GlobalRequestID(render_process_host_id_, deferred_request_id_)); |
| 182 if (request) | 182 if (request) |
| 183 original_url = request->original_url(); | 183 original_url = request->original_url(); |
| 184 else | 184 else |
| 185 original_url = url; | 185 original_url = url; |
| 186 | 186 |
| 187 safe_browsing_->DisplayBlockingPage( | 187 safe_browsing_->DisplayBlockingPage( |
| 188 url, original_url, resource_type_, result, this, render_process_host_id_, | 188 url, original_url, resource_type_, result, this, render_process_host_id_, |
| 189 render_view_id_); | 189 render_view_id_); |
| 190 } | 190 } |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 rdh_->FollowDeferredRedirect(render_process_host_id_, request_id, | 305 rdh_->FollowDeferredRedirect(render_process_host_id_, request_id, |
| 306 false, GURL()); | 306 false, GURL()); |
| 307 } | 307 } |
| 308 } | 308 } |
| 309 | 309 |
| 310 void SafeBrowsingResourceHandler::ClearDeferredRequestInfo() { | 310 void SafeBrowsingResourceHandler::ClearDeferredRequestInfo() { |
| 311 deferred_request_id_ = -1; | 311 deferred_request_id_ = -1; |
| 312 deferred_url_ = GURL(); | 312 deferred_url_ = GURL(); |
| 313 deferred_redirect_response_ = NULL; | 313 deferred_redirect_response_ = NULL; |
| 314 } | 314 } |
| OLD | NEW |