chrome/browser/interstitials/security_interstitial_page.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/interstitials/security_interstitial_page.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: cros 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/extensions/api/hotword_private/hotword_private_api.cc ('k') | chrome/browser/resources/about_conflicts.html » ('j') | no next file with comments »
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 dbc248acc9b887e6d47690e08c79425741172f46..8a72d874ac4729d6840b3fb00d87724872b8447e 100644

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

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

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

#include "base/i18n/rtl.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

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

#include "chrome/grit/browser_resources.h"

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

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

@@ -63,7 +64,8 @@ base::string16 SecurityInterstitialPage::GetFormattedHostName() const {

std::string SecurityInterstitialPage::GetHTMLContents() {

base::DictionaryValue load_time_data;

PopulateInterstitialStrings(&load_time_data);

- webui::SetFontAndTextDirection(&load_time_data);

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

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

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

.GetRawDataResource(IDR_SECURITY_INTERSTITIAL_HTML)

.as_string();