chrome/browser/ui/webui/policy_ui.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: chrome/browser/ui/webui/policy_ui.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: More cleanup and documentation 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

« chrome/browser/download/download_item_model.cc ('K') | « chrome/browser/ui/webui/ntp/foreign_session_handler.cc ('k') | chrome/common/time_format_browsertest.cc » ('j') | ui/base/l10n/formatter.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/policy_ui.cc

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

index 607a22868b12b29bffbc525fefc6dc72968d9813..2862c29b7a48e486baeb8446c5958e5b617a6d3d 100644

--- a/chrome/browser/ui/webui/policy_ui.cc

+++ b/chrome/browser/ui/webui/policy_ui.cc

@@ -188,11 +188,14 @@ void GetStatusFromCore(const policy::CloudPolicyCore* core,

dict->SetString("clientId", client_id);

dict->SetString("username", username);

dict->SetString("refreshInterval",

- ui::TimeFormat::TimeDurationShort(refresh_interval));

+ ui::TimeFormat::Simple(ui::TimeFormat::kDuration,

+ ui::TimeFormat::kShort,

+ refresh_interval));

dict->SetString("timeSinceLastRefresh", last_refresh_time.is_null() ?

l10n_util::GetStringUTF16(IDS_POLICY_NEVER_FETCHED) :

- ui::TimeFormat::TimeElapsed(base::Time::NowFromSystemTime() -

- last_refresh_time));

+ ui::TimeFormat::Simple(ui::TimeFormat::kElapsed, ui::TimeFormat::kShort,

+ base::Time::NowFromSystemTime() -

+ last_refresh_time));

}

void ExtractDomainFromUsername(base::DictionaryValue* dict) {