chrome/browser/supervised_user/supervised_user_interstitial.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/supervised_user/supervised_user_interstitial.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: revert stuff 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 | « chrome/browser/resources/supervised_user_block_interstitial.html ('k') | content/browser/webui/shared_resources_data_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_interstitial.cc

diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc

index 5572eba9f40fe0dd249e49255898fa0e0cb3205e..96d022dda51d81108bf3a546c29a9eea04e4e6d6 100644

--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc

+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc

@@ -269,8 +269,11 @@ std::string SupervisedUserInterstitial::GetHTMLContents() {

webui::SetFontAndTextDirection(&strings);

- base::StringPiece html(ResourceBundle::GetSharedInstance().GetRawDataResource(

- IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML));

+ std::string html =

+ ResourceBundle::GetSharedInstance()

+ .GetRawDataResource(IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML)

+ .as_string();

+ webui::AppendWebUiCssTextDefaults(&html);

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

}