ash/display/resolution_notification_controller.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/display/resolution_notification_controller.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

Index: ash/display/resolution_notification_controller.cc

diff --git a/ash/display/resolution_notification_controller.cc b/ash/display/resolution_notification_controller.cc

index 5f924e6eb7761698643fe2dd8a3784e117d75e11..a44e2da4a4d8a8f5190fc167d7636b58fb9edc32 100644

--- a/ash/display/resolution_notification_controller.cc

+++ b/ash/display/resolution_notification_controller.cc

@@ -212,7 +212,8 @@ void ResolutionNotificationController::CreateOrUpdateNotification(

l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_RESOLUTION_CHANGE_ACCEPT)));

timeout_message = l10n_util::GetStringFUTF16(

IDS_ASH_DISPLAY_RESOLUTION_TIMEOUT,

- ui::TimeFormat::TimeDurationLong(

+ ui::TimeFormat::Simple(

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

base::TimeDelta::FromSeconds(change_info_->timeout_count)));

}

data.buttons.push_back(message_center::ButtonInfo(

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