chrome/browser/supervised_user/supervised_user_interstitial.cc - Issue 880313002: webui: add [lang] attribute to <html> element on all webui pages so

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 880313002: webui: add [lang] attribute to <html> element on all webui pages so (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@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

« chrome/browser/resources/chromeos/first_run/first_run.html ('K') | « chrome/browser/resources/user_manager/user_manager.html ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc » ('J')
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..af08ade12049bca13e83b91f69f563c226bdb762 100644

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

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

@@ -11,6 +11,7 @@

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

+#include "chrome/browser/browser_process.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/supervised_user/supervised_user_service.h"

@@ -267,7 +268,8 @@ std::string SupervisedUserInterstitial::GetHTMLContents() {

strings.SetString("requestSentMessage", request_sent_message);

strings.SetString("requestFailedMessage", request_failed_message);

- webui::SetFontAndTextDirection(&strings);

+ const std::string& app_locale = g_browser_process->GetApplicationLocale();

+ webui::SetLoadTimeDataDefaults(app_locale, &strings);

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

IDR_SUPERVISED_USER_BLOCK_INTERSTITIAL_HTML));