| Index: ash/system/power/power_status_view.cc
|
| diff --git a/ash/system/power/power_status_view.cc b/ash/system/power/power_status_view.cc
|
| index 4f4ba07f06ac326bd3c1ac687733bf8926b01755..08a6de50372e41ff826789fc0a3719e2630e8d51 100644
|
| --- a/ash/system/power/power_status_view.cc
|
| +++ b/ash/system/power/power_status_view.cc
|
| @@ -4,8 +4,6 @@
|
|
|
| #include "ash/system/power/power_status_view.h"
|
|
|
| -#include "ash/shell.h"
|
| -#include "ash/shell_delegate.h"
|
| #include "ash/system/power/tray_power.h"
|
| #include "ash/system/tray/tray_constants.h"
|
| #include "ash/system/tray/tray_views.h"
|
| @@ -188,13 +186,12 @@ void PowerStatusView::UpdateTextForNotificationView() {
|
| // This is a low battery warning, which prompts user when battery
|
| // time left is not much (ie 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(string16());
|
| - }
|
| + time_label_->SetText(
|
| + l10n_util::GetStringFUTF16(
|
| + min > 1 ?
|
| + IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_EMPTY_PLURAL_MIN :
|
| + IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_EMPTY_SINGULAR_MIN,
|
| + base::IntToString16(min)));
|
| }
|
| } else {
|
| time_label_->SetText(string16());
|
|
|