content/browser/webui/web_ui_data_source_impl.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: content/browser/webui/web_ui_data_source_impl.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/ui/webui/chromeos/sim_unlock_ui.cc ('K') | « content/browser/resources/service_worker/serviceworker_internals.html ('k') | net/base/dir_header.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/webui/web_ui_data_source_impl.cc

diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc

index 8d8f4658db0e437f51220ee86a1c55cb768c5b42..f3a5777d3da932922f7b58b8d014424d59a01266 100644

--- a/content/browser/webui/web_ui_data_source_impl.cc

+++ b/content/browser/webui/web_ui_data_source_impl.cc

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

#include "base/memory/ref_counted_memory.h"

#include "base/strings/string_util.h"

#include "content/grit/content_resources.h"

+#include "content/public/browser/content_browser_client.h"

#include "content/public/common/content_client.h"

#include "third_party/mojo/src/mojo/public/js/constants.h"

#include "ui/base/webui/jstemplate_builder.h"

@@ -231,8 +232,10 @@ void WebUIDataSourceImpl::StartDataRequest(

void WebUIDataSourceImpl::SendLocalizedStringsAsJSON(

const URLDataSource::GotDataCallback& callback) {

std::string template_data;

- if (!disable_set_font_strings_)

- webui::SetFontAndTextDirection(&localized_strings_);

+ if (!disable_set_font_strings_) {

+ std::string locale = GetContentClient()->browser()->GetApplicationLocale();

+ webui::SetLoadTimeDataDefaults(locale, &localized_strings_);

+ }

webui::AppendJsonJS(&localized_strings_, &template_data);

callback.Run(base::RefCountedString::TakeString(&template_data));