chrome/browser/safe_browsing/safe_browsing_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/safe_browsing/safe_browsing_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

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

index 8a2c707b98ad6a4de67b2cb768690497f2cf343d..28b1accf4810eb147d631554edd1eb452d039126 100644

--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

@@ -35,6 +35,7 @@

#include "chrome/grit/locale_settings.h"

#include "components/google/core/browser/google_util.h"

#include "components/prefs/pref_service.h"

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

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

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/interstitial_page.h"

@@ -639,6 +640,8 @@ void SafeBrowsingBlockingPage::PopulateInterstitialStrings(

load_time_data->SetBoolean(

"overridable",

!IsPrefEnabled(prefs::kSafeBrowsingProceedAnywayDisabled));

+ security_interstitials::common_string_util::PopulateNewIconStrings(

+ load_time_data);

switch (interstitial_reason_) {

case SB_REASON_MALWARE:

« no previous file with comments | « no previous file | chrome/browser/ssl/captive_portal_blocking_page.cc » ('j') | no next file with comments »