chrome/browser/ui/webui/chromeos/proxy_settings_ui.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/ui/webui/chromeos/proxy_settings_ui.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/ui/webui/chromeos/mobile_setup_ui.cc ('k') | chrome/browser/ui/webui/chromeos/sim_unlock_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/ui/webui/chromeos/proxy_settings_ui.cc

diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

index d462b464dc1b75a2f1db8032f471d16c3c8d004f..e96976adac57cfe6758b92f35a5ee33da108fe9c 100644

--- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc

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

#include "base/memory/ref_counted_memory.h"

#include "base/memory/scoped_ptr.h"

#include "base/values.h"

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

#include "chrome/browser/chromeos/system/input_device_settings.h"

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

#include "chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h"

@@ -67,7 +68,8 @@ void ProxySettingsHTMLSource::StartDataRequest(

int render_process_id,

int render_frame_id,

const content::URLDataSource::GotDataCallback& callback) {

- webui::SetFontAndTextDirection(localized_strings_.get());

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

+ webui::SetLoadTimeDataDefaults(app_locale, localized_strings_.get());

static const base::StringPiece html(

ResourceBundle::GetSharedInstance().GetRawDataResource(