chrome/browser/ssl/captive_portal_blocking_page.cc - Issue 2158113002: Update interstitials to match the new security indicators

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ssl/captive_portal_blocking_page.cc

Issue 2158113002: Update interstitials to match the new security indicators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Windows test fix Created 4 years, 5 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/safe_browsing/safe_browsing_blocking_page.cc ('k') | components/security_interstitials/core/bad_clock_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ssl/captive_portal_blocking_page.cc

diff --git a/chrome/browser/ssl/captive_portal_blocking_page.cc b/chrome/browser/ssl/captive_portal_blocking_page.cc

index cf610aa48ef62d09d71d9608b3030c39692275e1..3b5483a02726b9c197d4d1c89b15ed395cf6df72 100644

--- a/chrome/browser/ssl/captive_portal_blocking_page.cc

+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc

@@ -18,6 +18,7 @@

#include "chrome/browser/ssl/ssl_cert_reporter.h"

#include "components/captive_portal/captive_portal_detector.h"

#include "components/certificate_reporting/error_reporter.h"

+#include "components/security_interstitials/core/common_string_util.h"

#include "components/security_interstitials/core/controller_client.h"

#include "components/url_formatter/url_formatter.h"

#include "components/wifi/wifi_service.h"

@@ -119,6 +120,8 @@ void CaptivePortalBlockingPage::PopulateInterstitialStrings(

load_time_data->SetString("iconClass", "icon-offline");

load_time_data->SetString("type", "CAPTIVE_PORTAL");

load_time_data->SetBoolean("overridable", false);

+ security_interstitials::common_string_util::PopulateNewIconStrings(

+ load_time_data);

// |IsWifiConnection| isn't accurate on some platforms, so always try to get

// the Wi-Fi SSID even if |IsWifiConnection| is false.