ash/system/logout_button/logout_confirmation_dialog_view.cc - Issue 147443007: Add support for localized time strings with two units, eg. "2 hours 17 minutes"

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: ash/system/logout_button/logout_confirmation_dialog_view.cc

Issue 147443007: Add support for localized time strings with two units, eg. "2 hours 17 minutes" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address Tony's comments Created 6 years, 10 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 | « ash/system/chromeos/power/power_status_view.cc ('k') | ash/system/session_length_limit/tray_session_length_limit.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/logout_button/logout_confirmation_dialog_view.cc

diff --git a/ash/system/logout_button/logout_confirmation_dialog_view.cc b/ash/system/logout_button/logout_confirmation_dialog_view.cc

index 3e65dbf073a8ca2f02b0c01972a7afbb79aadcde..85be3653f3d653c671ad36fca58188c7c4616058 100644

--- a/ash/system/logout_button/logout_confirmation_dialog_view.cc

+++ b/ash/system/logout_button/logout_confirmation_dialog_view.cc

@@ -123,8 +123,9 @@ void LogoutConfirmationDialogView::UpdateCountdown() {

if (seconds_remaining > 0) {

text_label_->SetText(l10n_util::GetStringFUTF16(

IDS_ASH_LOGOUT_CONFIRMATION_WARNING,

- ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromSeconds(

- seconds_remaining))));

+ ui::TimeFormat::Simple(

+ ui::TimeFormat::FORMAT_DURATION, ui::TimeFormat::LENGTH_LONG,

+ base::TimeDelta::FromSeconds(seconds_remaining))));

} else {

text_label_->SetText(l10n_util::GetStringUTF16(

IDS_ASH_LOGOUT_CONFIRMATION_WARNING_NOW));

« no previous file with comments | « ash/system/chromeos/power/power_status_view.cc ('k') | ash/system/session_length_limit/tray_session_length_limit.cc » ('j') | no next file with comments »