OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/automation/url_request_automation_job.h" | 5 #include "chrome/browser/automation/url_request_automation_job.h" |
6 | 6 |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/time.h" | 8 #include "base/time.h" |
9 #include "chrome/browser/automation/automation_resource_message_filter.h" | 9 #include "chrome/browser/automation/automation_resource_message_filter.h" |
10 #include "chrome/browser/renderer_host/render_view_host.h" | 10 #include "chrome/browser/renderer_host/render_view_host.h" |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
324 DLOG(INFO) << "URLRequestAutomationJob: " | 324 DLOG(INFO) << "URLRequestAutomationJob: " |
325 << url << " - request end. Status: " << status.status(); | 325 << url << " - request end. Status: " << status.status(); |
326 #endif | 326 #endif |
327 | 327 |
328 // TODO(tommi): When we hit certificate errors, notify the delegate via | 328 // TODO(tommi): When we hit certificate errors, notify the delegate via |
329 // OnSSLCertificateError(). Right now we don't have the certificate | 329 // OnSSLCertificateError(). Right now we don't have the certificate |
330 // so we don't. We could possibly call OnSSLCertificateError with a NULL | 330 // so we don't. We could possibly call OnSSLCertificateError with a NULL |
331 // certificate, but I'm not sure if all implementations expect it. | 331 // certificate, but I'm not sure if all implementations expect it. |
332 // if (status.status() == URLRequestStatus::FAILED && | 332 // if (status.status() == URLRequestStatus::FAILED && |
333 // net::IsCertificateError(status.os_error()) && request_->delegate()) { | 333 // net::IsCertificateError(status.os_error()) && request_->delegate()) { |
334 // request_->delegate()->OnSSLCertificateError(request_, status.os_error(), | 334 // request_->delegate()->OnSSLCertificateError(request_, status.os_error()); |
335 // NULL); | |
336 // } | 335 // } |
337 | 336 |
338 DisconnectFromMessageFilter(); | 337 DisconnectFromMessageFilter(); |
339 // NotifyDone may have been called on the job if the original request was | 338 // NotifyDone may have been called on the job if the original request was |
340 // redirected. | 339 // redirected. |
341 if (!is_done()) | 340 if (!is_done()) |
342 NotifyDone(status); | 341 NotifyDone(status); |
343 | 342 |
344 // Reset any pending reads. | 343 // Reset any pending reads. |
345 if (pending_buf_) { | 344 if (pending_buf_) { |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 message_filter_->Send(new AutomationMsg_RequestStart(0, tab_, id_, | 421 message_filter_->Send(new AutomationMsg_RequestStart(0, tab_, id_, |
423 automation_request)); | 422 automation_request)); |
424 } | 423 } |
425 | 424 |
426 void URLRequestAutomationJob::DisconnectFromMessageFilter() { | 425 void URLRequestAutomationJob::DisconnectFromMessageFilter() { |
427 if (message_filter_) { | 426 if (message_filter_) { |
428 message_filter_->UnRegisterRequest(this); | 427 message_filter_->UnRegisterRequest(this); |
429 message_filter_ = NULL; | 428 message_filter_ = NULL; |
430 } | 429 } |
431 } | 430 } |
OLD | NEW |