chrome/browser/ui/webui/chromeos/mobile_setup_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/mobile_setup_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: 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/browser/ui/webui/chromeos/mobile_setup_ui.cc

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

index 31b9e821f05046609f6d16c65dfbc6f5ee193e50..dffbc158879ef9f36f3d9505f95b6956a6176ff8 100644

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

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

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

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

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

#include "chrome/browser/chromeos/mobile/mobile_activator.h"

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

#include "chrome/browser/ui/browser_list.h"

@@ -330,7 +331,9 @@ void MobileSetupUIHTMLSource::GetPropertiesAndStartDataRequest(

l10n_util::GetStringUTF16(IDS_CANCEL));

strings.SetString("ok_button",

l10n_util::GetStringUTF16(IDS_OK));

- webui::SetFontAndTextDirection(&strings);

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

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

// The webui differs based on whether the network is activated or not. If the

// network is activated, the webui goes straight to portal. Otherwise the

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc » ('j') | no next file with comments »