chrome/browser/chromeos/login/signin/merge_session_load_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/chromeos/login/signin/merge_session_load_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/chromeos/extensions/wallpaper_private_api.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/signin/merge_session_load_page.cc

diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

index 0d6b107fadf0c8c2ee91598f4fe8a288cb6339f8..e0c013e4248f41ca62f2cd38b5786a96e7e06ac2 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

+++ b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

@@ -7,12 +7,12 @@

#include "ash/shell.h"

#include "ash/shell_delegate.h"

#include "ash/system/tray/system_tray_delegate.h"

-#include "base/i18n/rtl.h"

#include "base/metrics/histogram.h"

#include "base/strings/string_piece.h"

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

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

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"

#include "chrome/browser/extensions/extension_service.h"

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

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

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

+#include "ui/base/webui/web_ui_util.h"

using content::BrowserThread;

using content::InterstitialPage;

@@ -87,8 +88,8 @@ std::string MergeSessionLoadPage::GetHTMLContents() {

strings.SetString("heading",

l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE));

- bool rtl = base::i18n::IsRTL();

- strings.SetString("textdirection", rtl ? "rtl" : "ltr");

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

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

base::StringPiece html(

ResourceBundle::GetSharedInstance().GetRawDataResource(