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/safe_browsing_db/v4_feature_list.h" | 18 #include "components/safe_browsing_db/v4_feature_list.h" |
19 #include "components/safe_browsing_db/v4_local_database_manager.h" | 19 #include "components/safe_browsing_db/v4_local_database_manager.h" |
20 #include "components/subresource_filter/content/browser/content_subresource_filt
er_driver_factory.h" | 20 #include "components/subresource_filter/content/browser/content_subresource_filt
er_driver_factory.h" |
21 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
22 #include "content/public/browser/render_frame_host.h" | 22 #include "content/public/browser/render_frame_host.h" |
23 #include "content/public/browser/resource_controller.h" | 23 #include "content/public/browser/resource_controller.h" |
24 #include "content/public/browser/resource_request_info.h" | 24 #include "content/public/browser/resource_request_info.h" |
25 #include "content/public/browser/web_contents.h" | 25 #include "content/public/browser/web_contents.h" |
26 #include "net/base/load_flags.h" | 26 #include "net/base/load_flags.h" |
27 #include "net/log/net_log.h" | 27 #include "net/log/net_log_capture_mode.h" |
| 28 #include "net/log/net_log_source.h" |
28 #include "net/log/net_log_source_type.h" | 29 #include "net/log/net_log_source_type.h" |
29 #include "net/url_request/redirect_info.h" | 30 #include "net/url_request/redirect_info.h" |
30 #include "net/url_request/url_request.h" | 31 #include "net/url_request/url_request.h" |
31 | 32 |
32 using net::NetLogEventType; | 33 using net::NetLogEventType; |
33 using net::NetLogSourceType; | 34 using net::NetLogSourceType; |
34 using safe_browsing::SafeBrowsingUIManager; | 35 using safe_browsing::SafeBrowsingUIManager; |
35 | 36 |
36 namespace { | 37 namespace { |
37 | 38 |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
433 unchecked_redirect_url_, "defer_reason", | 434 unchecked_redirect_url_, "defer_reason", |
434 "resumed_redirect"); | 435 "resumed_redirect"); |
435 } | 436 } |
436 } | 437 } |
437 | 438 |
438 if (resume) { | 439 if (resume) { |
439 defer_state_ = DEFERRED_NONE; | 440 defer_state_ = DEFERRED_NONE; |
440 controller()->Resume(); | 441 controller()->Resume(); |
441 } | 442 } |
442 } | 443 } |
OLD | NEW |