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

Unified Diff: chrome/browser/ui/webui/interstitials/interstitial_ui.cc

Issue 2220603003: Remove unnecessary |result| argument from AllowCertificateError() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove unnecessary include Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ssl/ssl_error_handler_unittest.cc ('k') | chromecast/browser/cast_content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/interstitials/interstitial_ui.cc
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
index 2f0cbd5ecdbff954c1b7efe0145e8dd24221204a..9cfbe6772fddcdf954fa6c6b0a889c408c675709 100644
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -94,7 +94,8 @@ class CaptivePortalBlockingPageWithNetInfo : public CaptivePortalBlockingPage {
const GURL& request_url,
const GURL& login_url,
const net::SSLInfo& ssl_info,
- const base::Callback<void(bool)>& callback,
+ const base::Callback<void(content::CertificateRequestResultType)>&
+ callback,
bool is_wifi,
const std::string& wifi_ssid)
: CaptivePortalBlockingPage(web_contents,
@@ -152,9 +153,10 @@ SSLBlockingPage* CreateSSLBlockingPage(content::WebContents* web_contents) {
options_mask |= security_interstitials::SSLErrorUI::SOFT_OVERRIDE_ENABLED;
if (strict_enforcement)
options_mask |= security_interstitials::SSLErrorUI::STRICT_ENFORCEMENT;
- return new SSLBlockingPage(web_contents, cert_error, ssl_info, request_url,
- options_mask, time_triggered_, nullptr,
- base::Callback<void(bool)>());
+ return new SSLBlockingPage(
+ web_contents, cert_error, ssl_info, request_url, options_mask,
+ time_triggered_, nullptr,
+ base::Callback<void(content::CertificateRequestResultType)>());
}
BadClockBlockingPage* CreateBadClockBlockingPage(
@@ -200,9 +202,10 @@ BadClockBlockingPage* CreateBadClockBlockingPage(
options_mask |= security_interstitials::SSLErrorUI::SOFT_OVERRIDE_ENABLED;
if (strict_enforcement)
options_mask |= security_interstitials::SSLErrorUI::STRICT_ENFORCEMENT;
- return new BadClockBlockingPage(web_contents, cert_error, ssl_info,
- request_url, base::Time::Now(), clock_state,
- nullptr, base::Callback<void(bool)>());
+ return new BadClockBlockingPage(
+ web_contents, cert_error, ssl_info, request_url, base::Time::Now(),
+ clock_state, nullptr,
+ base::Callback<void(content::CertificateRequestResultType)>());
}
safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
@@ -294,7 +297,8 @@ CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
CaptivePortalBlockingPage* blocking_page =
new CaptivePortalBlockingPageWithNetInfo(
web_contents, request_url, landing_url, ssl_info,
- base::Callback<void(bool)>(), is_wifi_connection, wifi_ssid);
+ base::Callback<void(content::CertificateRequestResultType)>(),
+ is_wifi_connection, wifi_ssid);
return blocking_page;
}
#endif
« no previous file with comments | « chrome/browser/ssl/ssl_error_handler_unittest.cc ('k') | chromecast/browser/cast_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698