Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1199)

Side by Side Diff: chrome/browser/ssl/captive_portal_blocking_page.cc

Issue 2869383002: Unify safe_browsing* components [1]: move safe_browsing_prefs* (Closed)
Patch Set: fix win bots Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ssl/bad_clock_blocking_page.cc ('k') | chrome/browser/ssl/cert_report_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "base/metrics/histogram_macros.h" 11 #include "base/metrics/histogram_macros.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "build/build_config.h" 16 #include "build/build_config.h"
17 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" 17 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
18 #include "chrome/browser/interstitials/chrome_controller_client.h" 18 #include "chrome/browser/interstitials/chrome_controller_client.h"
19 #include "chrome/browser/interstitials/chrome_metrics_helper.h" 19 #include "chrome/browser/interstitials/chrome_metrics_helper.h"
20 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
21 #include "chrome/browser/ssl/cert_report_helper.h" 21 #include "chrome/browser/ssl/cert_report_helper.h"
22 #include "chrome/browser/ssl/ssl_cert_reporter.h" 22 #include "chrome/browser/ssl/ssl_cert_reporter.h"
23 #include "chrome/grit/generated_resources.h" 23 #include "chrome/grit/generated_resources.h"
24 #include "components/captive_portal/captive_portal_detector.h" 24 #include "components/captive_portal/captive_portal_detector.h"
25 #include "components/certificate_reporting/error_reporter.h" 25 #include "components/certificate_reporting/error_reporter.h"
26 #include "components/safe_browsing_db/safe_browsing_prefs.h" 26 #include "components/safe_browsing/common/safe_browsing_prefs.h"
27 #include "components/security_interstitials/core/controller_client.h" 27 #include "components/security_interstitials/core/controller_client.h"
28 #include "components/security_interstitials/core/metrics_helper.h" 28 #include "components/security_interstitials/core/metrics_helper.h"
29 #include "components/url_formatter/url_formatter.h" 29 #include "components/url_formatter/url_formatter.h"
30 #include "components/wifi/wifi_service.h" 30 #include "components/wifi/wifi_service.h"
31 #include "content/public/browser/navigation_entry.h" 31 #include "content/public/browser/navigation_entry.h"
32 #include "content/public/browser/ssl_status.h" 32 #include "content/public/browser/ssl_status.h"
33 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
34 #include "net/base/network_change_notifier.h" 34 #include "net/base/network_change_notifier.h"
35 #include "net/base/network_interfaces.h" 35 #include "net/base/network_interfaces.h"
36 #include "net/ssl/ssl_info.h" 36 #include "net/ssl/ssl_info.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 certificate_reporting::ErrorReport::USER_DID_NOT_PROCEED); 274 certificate_reporting::ErrorReport::USER_DID_NOT_PROCEED);
275 } 275 }
276 276
277 // Need to explicity deny the certificate via the callback, otherwise memory 277 // Need to explicity deny the certificate via the callback, otherwise memory
278 // is leaked. 278 // is leaked.
279 if (!callback_.is_null()) { 279 if (!callback_.is_null()) {
280 callback_.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL); 280 callback_.Run(content::CERTIFICATE_REQUEST_RESULT_TYPE_CANCEL);
281 callback_.Reset(); 281 callback_.Reset();
282 } 282 }
283 } 283 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/bad_clock_blocking_page.cc ('k') | chrome/browser/ssl/cert_report_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698