chrome/browser/interstitials/security_interstitial_page.cc - Issue 830743003: Directly inline shared WebUI CSS declarations into the security and supervised user interstitials.

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/interstitials/security_interstitial_page.cc

Issue 830743003: Directly inline shared WebUI CSS declarations into the security and supervised user interstitials. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Created 5 years, 11 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 | « no previous file | chrome/browser/resources/security_warnings/interstitial_v2.html » ('j') | chrome/browser/resources/security_warnings/interstitial_v2.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/interstitials/security_interstitial_page.cc

diff --git a/chrome/browser/interstitials/security_interstitial_page.cc b/chrome/browser/interstitials/security_interstitial_page.cc

index 513219631c1fa5c538f47cd014931887e123ff34..46b584815844e2a8361a47b629506b101e43da36 100644

--- a/chrome/browser/interstitials/security_interstitial_page.cc

+++ b/chrome/browser/interstitials/security_interstitial_page.cc

@@ -63,9 +63,9 @@ base::string16 SecurityInterstitialPage::GetFormattedHostName() const {

std::string SecurityInterstitialPage::GetHTMLContents() {

base::DictionaryValue load_time_data;

PopulateInterstitialStrings(&load_time_data);

- webui::SetFontAndTextDirection(&load_time_data);

- base::StringPiece html(

- ResourceBundle::GetSharedInstance().GetRawDataResource(

- IDR_SECURITY_INTERSTITIAL_HTML));

+ std::string html = ResourceBundle::GetSharedInstance()

+ .GetRawDataResource(IDR_SECURITY_INTERSTITIAL_HTML)

+ .as_string();

+ webui::AppendWebUICSSTextDefaults(&html);

return webui::GetI18nTemplateHtml(html, &load_time_data);

}