| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/loader/safe_browsing_resource_throttle.h" | 5 #include "chrome/browser/loader/safe_browsing_resource_throttle.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/metrics/histogram_macros.h" | 11 #include "base/metrics/histogram_macros.h" |
| 12 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
| 15 #include "chrome/browser/prerender/prerender_contents.h" | 15 #include "chrome/browser/prerender/prerender_contents.h" |
| 16 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 16 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 17 #include "components/safe_browsing_db/util.h" | 17 #include "components/safe_browsing_db/util.h" |
| 18 #include "components/subresource_filter/content/browser/content_subresource_filt
er_driver_factory.h" | 18 #include "components/subresource_filter/content/browser/content_subresource_filt
er_driver_factory.h" |
| 19 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
| 20 #include "content/public/browser/render_frame_host.h" | 20 #include "content/public/browser/render_frame_host.h" |
| 21 #include "content/public/browser/resource_controller.h" | 21 #include "content/public/browser/resource_controller.h" |
| 22 #include "content/public/browser/resource_request_info.h" | 22 #include "content/public/browser/resource_request_info.h" |
| 23 #include "content/public/browser/web_contents.h" | 23 #include "content/public/browser/web_contents.h" |
| 24 #include "net/base/load_flags.h" | 24 #include "net/base/load_flags.h" |
| 25 #include "net/log/net_log.h" | 25 #include "net/log/net_log_capture_mode.h" |
| 26 #include "net/log/net_log_source.h" |
| 26 #include "net/log/net_log_source_type.h" | 27 #include "net/log/net_log_source_type.h" |
| 27 #include "net/url_request/redirect_info.h" | 28 #include "net/url_request/redirect_info.h" |
| 28 #include "net/url_request/url_request.h" | 29 #include "net/url_request/url_request.h" |
| 29 | 30 |
| 30 using net::NetLogEventType; | 31 using net::NetLogEventType; |
| 31 using net::NetLogSourceType; | 32 using net::NetLogSourceType; |
| 32 using safe_browsing::SafeBrowsingUIManager; | 33 using safe_browsing::SafeBrowsingUIManager; |
| 33 | 34 |
| 34 namespace { | 35 namespace { |
| 35 | 36 |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 unchecked_redirect_url_, "defer_reason", | 419 unchecked_redirect_url_, "defer_reason", |
| 419 "resumed_redirect"); | 420 "resumed_redirect"); |
| 420 } | 421 } |
| 421 } | 422 } |
| 422 | 423 |
| 423 if (resume) { | 424 if (resume) { |
| 424 defer_state_ = DEFERRED_NONE; | 425 defer_state_ = DEFERRED_NONE; |
| 425 controller()->Resume(); | 426 controller()->Resume(); |
| 426 } | 427 } |
| 427 } | 428 } |
| OLD | NEW |