OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ssl/captive_portal_blocking_page.h" | 5 #include "chrome/browser/ssl/captive_portal_blocking_page.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
11 #include "base/prefs/pref_service.h" | |
12 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
13 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
14 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
15 #include "base/values.h" | 14 #include "base/values.h" |
16 #include "build/build_config.h" | 15 #include "build/build_config.h" |
17 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" | 16 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" |
18 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/ssl/cert_report_helper.h" | 18 #include "chrome/browser/ssl/cert_report_helper.h" |
20 #include "chrome/browser/ssl/ssl_cert_reporter.h" | 19 #include "chrome/browser/ssl/ssl_cert_reporter.h" |
21 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
22 #include "components/captive_portal/captive_portal_detector.h" | 21 #include "components/captive_portal/captive_portal_detector.h" |
23 #include "components/certificate_reporting/error_reporter.h" | 22 #include "components/certificate_reporting/error_reporter.h" |
| 23 #include "components/prefs/pref_service.h" |
24 #include "components/security_interstitials/core/controller_client.h" | 24 #include "components/security_interstitials/core/controller_client.h" |
25 #include "components/url_formatter/url_formatter.h" | 25 #include "components/url_formatter/url_formatter.h" |
26 #include "components/wifi/wifi_service.h" | 26 #include "components/wifi/wifi_service.h" |
27 #include "content/public/browser/web_contents.h" | 27 #include "content/public/browser/web_contents.h" |
28 #include "grit/generated_resources.h" | 28 #include "grit/generated_resources.h" |
29 #include "net/base/net_util.h" | 29 #include "net/base/net_util.h" |
30 #include "net/base/network_change_notifier.h" | 30 #include "net/base/network_change_notifier.h" |
31 #include "net/base/network_interfaces.h" | 31 #include "net/base/network_interfaces.h" |
32 #include "net/ssl/ssl_info.h" | 32 #include "net/ssl/ssl_info.h" |
33 #include "ui/base/l10n/l10n_util.h" | 33 #include "ui/base/l10n/l10n_util.h" |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 certificate_reporting::ErrorReport::USER_DID_NOT_PROCEED); | 223 certificate_reporting::ErrorReport::USER_DID_NOT_PROCEED); |
224 } | 224 } |
225 | 225 |
226 // Need to explicity deny the certificate via the callback, otherwise memory | 226 // Need to explicity deny the certificate via the callback, otherwise memory |
227 // is leaked. | 227 // is leaked. |
228 if (!callback_.is_null()) { | 228 if (!callback_.is_null()) { |
229 callback_.Run(false); | 229 callback_.Run(false); |
230 callback_.Reset(); | 230 callback_.Reset(); |
231 } | 231 } |
232 } | 232 } |
OLD | NEW |