summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/chrome/browser/ui/webui/interstitials/interstitial_ui.cc')
-rw-r--r--chromium/chrome/browser/ui/webui/interstitials/interstitial_ui.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/chromium/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chromium/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
index 51016ebb1a9..96408e5feab 100644
--- a/chromium/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chromium/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -26,6 +26,7 @@
#include "components/grit/components_resources.h"
#include "components/safe_browsing/db/database_manager.h"
#include "components/security_interstitials/content/origin_policy_ui.h"
+#include "components/security_interstitials/core/ssl_error_options_mask.h"
#include "components/security_interstitials/core/ssl_error_ui.h"
#include "content/public/browser/interstitial_page_delegate.h"
#include "content/public/browser/render_frame_host.h"
@@ -41,6 +42,7 @@
#include "net/cert/x509_util.h"
#include "net/ssl/ssl_info.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
+#include "services/network/public/cpp/origin_policy.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/webui/web_ui_util.h"
@@ -180,9 +182,11 @@ SSLBlockingPage* CreateSSLBlockingPage(content::WebContents* web_contents) {
// This delegate doesn't create an interstitial.
int options_mask = 0;
if (overridable)
- options_mask |= security_interstitials::SSLErrorUI::SOFT_OVERRIDE_ENABLED;
+ options_mask |=
+ security_interstitials::SSLErrorOptionsMask::SOFT_OVERRIDE_ENABLED;
if (strict_enforcement)
- options_mask |= security_interstitials::SSLErrorUI::STRICT_ENFORCEMENT;
+ options_mask |=
+ security_interstitials::SSLErrorOptionsMask::STRICT_ENFORCEMENT;
return SSLBlockingPage::Create(
web_contents, cert_error, ssl_info, request_url, options_mask,
time_triggered_, GURL(), nullptr,
@@ -250,9 +254,11 @@ BadClockBlockingPage* CreateBadClockBlockingPage(
// This delegate doesn't create an interstitial.
int options_mask = 0;
if (overridable)
- options_mask |= security_interstitials::SSLErrorUI::SOFT_OVERRIDE_ENABLED;
+ options_mask |=
+ security_interstitials::SSLErrorOptionsMask::SOFT_OVERRIDE_ENABLED;
if (strict_enforcement)
- options_mask |= security_interstitials::SSLErrorUI::STRICT_ENFORCEMENT;
+ options_mask |=
+ security_interstitials::SSLErrorOptionsMask::STRICT_ENFORCEMENT;
return new BadClockBlockingPage(
web_contents, cert_error, ssl_info, request_url, base::Time::Now(),
clock_state, nullptr,