chrome/renderer/chrome_content_renderer_client.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/renderer/chrome_content_renderer_client.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

Index: chrome/renderer/chrome_content_renderer_client.cc

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc

index b09b82009051284f0807dc031997b1ade05edd1f..7bd91af0a1a404df35040994c63f545fbdd4a94d 100644

--- a/chrome/renderer/chrome_content_renderer_client.cc

+++ b/chrome/renderer/chrome_content_renderer_client.cc

@@ -326,7 +326,7 @@ void ChromeContentRendererClient::RenderThreadStarted() {

prerender_dispatcher_.reset(new prerender::PrerenderDispatcher());

#if defined(ENABLE_WEBRTC)

webrtc_logging_message_filter_ = new WebRtcLoggingMessageFilter(

- content::RenderThread::Get()->GetIOMessageLoopProxy());

+ RenderThread::Get()->GetIOMessageLoopProxy());

#endif

search_bouncer_.reset(new SearchBouncer());

@@ -347,7 +347,7 @@ void ChromeContentRendererClient::RenderThreadStarted() {

#endif

#if defined(ENABLE_EXTENSIONS)

thread->AddFilter(new CastIPCDispatcher(

- content::RenderThread::Get()->GetIOMessageLoopProxy()));

+ RenderThread::Get()->GetIOMessageLoopProxy()));

#endif

thread->RegisterExtension(extensions_v8::ExternalExtension::Get());

@@ -1142,7 +1142,8 @@ void ChromeContentRendererClient::GetNavigationErrorStrings(

NOTREACHED() << "unable to load template. ID: " << resource_id;

} else {

base::DictionaryValue error_strings;

- LocalizedError::GetAppErrorStrings(failed_url, extension,

+ const std::string locale = RenderThread::Get()->GetLocale();

+ LocalizedError::GetAppErrorStrings(failed_url, extension, locale,

&error_strings);

// "t" is the id of the template's root node.

*error_html = webui::GetTemplatesHtml(template_html, &error_strings,

« no previous file with comments | « chrome/common/localized_error.cc ('k') | chrome/renderer/resources/error_app.html » ('j') | no next file with comments »