summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/shell/shell_delegate_impl.cc10
-rw-r--r--ash/shell/shell_delegate_impl.h3
-rw-r--r--ash/shell_delegate.h9
-rw-r--r--ash/system/chromeos/power/power_status.cc13
-rw-r--r--ash/system/chromeos/power/power_status_view.cc10
-rw-r--r--ash/test/test_shell_delegate.cc10
-rw-r--r--ash/test/test_shell_delegate.h3
-rw-r--r--chrome/browser/ui/ash/chrome_shell_delegate.cc9
-rw-r--r--chrome/browser/ui/ash/chrome_shell_delegate.h2
9 files changed, 8 insertions, 61 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 318873c..20d0a7f 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -231,16 +231,6 @@ void ShellDelegateImpl::HandleMediaPlayPause() {
void ShellDelegateImpl::HandleMediaPrevTrack() {
}
-base::string16 ShellDelegateImpl::GetTimeRemainingString(
- base::TimeDelta delta) {
- return base::string16();
-}
-
-base::string16 ShellDelegateImpl::GetTimeDurationLongString(
- base::TimeDelta delta) {
- return base::string16();
-}
-
void ShellDelegateImpl::SaveScreenMagnifierScale(double scale) {
}
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index c01b201..7a4e5d6 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -71,9 +71,6 @@ class ShellDelegateImpl : public ash::ShellDelegate {
virtual void HandleMediaNextTrack() OVERRIDE;
virtual void HandleMediaPlayPause() OVERRIDE;
virtual void HandleMediaPrevTrack() OVERRIDE;
- virtual base::string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
- virtual base::string16 GetTimeDurationLongString(
- base::TimeDelta delta) OVERRIDE;
virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
virtual double GetSavedScreenMagnifierScale() OVERRIDE;
virtual ui::MenuModel* CreateContextMenu(
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 2bf08c1..38164f2 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -12,7 +12,6 @@
#include "ash/shell.h"
#include "base/callback.h"
#include "base/strings/string16.h"
-#include "base/time/time.h"
namespace app_list {
class AppListViewDelegate;
@@ -235,14 +234,6 @@ class ASH_EXPORT ShellDelegate {
// Handles the Previous Track Media shortcut key.
virtual void HandleMediaPrevTrack() = 0;
- // Produces l10n-ed text of remaining time, e.g.: "13 minutes left" or
- // "13 Minuten links".
- // Used, for example, to display the remaining battery life.
- virtual base::string16 GetTimeRemainingString(base::TimeDelta delta) = 0;
-
- // Produces l10n-ed text for time duration, e.g.: "13 minutes" or "2 hours".
- virtual base::string16 GetTimeDurationLongString(base::TimeDelta delta) = 0;
-
// Saves the zoom scale of the full screen magnifier.
virtual void SaveScreenMagnifierScale(double scale) = 0;
diff --git a/ash/system/chromeos/power/power_status.cc b/ash/system/chromeos/power/power_status.cc
index a9f4dbf..0283a0c 100644
--- a/ash/system/chromeos/power/power_status.cc
+++ b/ash/system/chromeos/power/power_status.cc
@@ -17,6 +17,7 @@
#include "grit/ash_resources.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/l10n/time_format.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia_operations.h"
@@ -47,19 +48,15 @@ void SanitizeProto(power_manager::PowerSupplyProperties* proto) {
base::string16 GetBatteryTimeAccessibilityString(int hour, int min) {
DCHECK(hour || min);
if (hour && !min) {
- return Shell::GetInstance()->delegate()->GetTimeDurationLongString(
- base::TimeDelta::FromHours(hour));
+ return ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromHours(hour));
}
if (min && !hour) {
- return Shell::GetInstance()->delegate()->GetTimeDurationLongString(
- base::TimeDelta::FromMinutes(min));
+ return ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromMinutes(min));
}
return l10n_util::GetStringFUTF16(
IDS_ASH_STATUS_TRAY_BATTERY_TIME_ACCESSIBLE,
- Shell::GetInstance()->delegate()->GetTimeDurationLongString(
- base::TimeDelta::FromHours(hour)),
- Shell::GetInstance()->delegate()->GetTimeDurationLongString(
- base::TimeDelta::FromMinutes(min)));
+ ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromHours(hour)),
+ ui::TimeFormat::TimeDurationLong(base::TimeDelta::FromMinutes(min)));
}
static PowerStatus* g_power_status = NULL;
diff --git a/ash/system/chromeos/power/power_status_view.cc b/ash/system/chromeos/power/power_status_view.cc
index a38d315..5323f5c 100644
--- a/ash/system/chromeos/power/power_status_view.cc
+++ b/ash/system/chromeos/power/power_status_view.cc
@@ -14,6 +14,7 @@
#include "base/strings/utf_string_conversions.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/l10n/time_format.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
@@ -193,13 +194,8 @@ void PowerStatusView::UpdateTextForNotificationView() {
} else {
// This is a low battery warning prompting the user in minutes.
min = hour * 60 + min;
- ShellDelegate* delegate = Shell::GetInstance()->delegate();
- if (delegate) {
- time_label_->SetText(delegate->GetTimeRemainingString(
- base::TimeDelta::FromMinutes(min)));
- } else {
- time_label_->SetText(base::string16());
- }
+ time_label_->SetText(ui::TimeFormat::TimeRemaining(
+ base::TimeDelta::FromMinutes(min)));
}
} else {
time_label_->SetText(base::string16());
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 532876e..9b51e6a 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -191,16 +191,6 @@ void TestShellDelegate::HandleMediaPlayPause() {
void TestShellDelegate::HandleMediaPrevTrack() {
}
-base::string16 TestShellDelegate::GetTimeRemainingString(
- base::TimeDelta delta) {
- return base::string16();
-}
-
-base::string16 TestShellDelegate::GetTimeDurationLongString(
- base::TimeDelta delta) {
- return base::string16();
-}
-
void TestShellDelegate::SaveScreenMagnifierScale(double scale) {
}
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index b8a618b..dc8875b 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -74,9 +74,6 @@ class TestShellDelegate : public ShellDelegate {
virtual void HandleMediaNextTrack() OVERRIDE;
virtual void HandleMediaPlayPause() OVERRIDE;
virtual void HandleMediaPrevTrack() OVERRIDE;
- virtual base::string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
- virtual base::string16 GetTimeDurationLongString(
- base::TimeDelta delta) OVERRIDE;
virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
virtual double GetSavedScreenMagnifierScale() OVERRIDE;
virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index ebc3e21..1d0d4f6 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -48,7 +48,6 @@
#include "ui/aura/client/user_action_client.h"
#include "ui/aura/window.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/l10n/time_format.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/default_pinned_apps_field_trial.h"
@@ -417,14 +416,6 @@ void ChromeShellDelegate::RecordUserMetricsAction(
}
}
-string16 ChromeShellDelegate::GetTimeRemainingString(base::TimeDelta delta) {
- return ui::TimeFormat::TimeRemainingLong(delta);
-}
-
-string16 ChromeShellDelegate::GetTimeDurationLongString(base::TimeDelta delta) {
- return ui::TimeFormat::TimeDurationLong(delta);
-}
-
ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::RootWindow* root) {
DCHECK(launcher_delegate_);
// Don't show context menu for exclusive app runtime mode.
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
index c6e41db..ef8ea0f 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -88,8 +88,6 @@ class ChromeShellDelegate : public ash::ShellDelegate,
virtual void HandleMediaNextTrack() OVERRIDE;
virtual void HandleMediaPlayPause() OVERRIDE;
virtual void HandleMediaPrevTrack() OVERRIDE;
- virtual string16 GetTimeRemainingString(base::TimeDelta delta) OVERRIDE;
- virtual string16 GetTimeDurationLongString(base::TimeDelta delta) OVERRIDE;
virtual void SaveScreenMagnifierScale(double scale) OVERRIDE;
virtual double GetSavedScreenMagnifierScale() OVERRIDE;
virtual ui::MenuModel* CreateContextMenu(aura::RootWindow* root) OVERRIDE;
generated by cgit v1.1 at 2025-05-18 20:03:44 +0000