| Index: ash/common/system/chromeos/power/power_status_view.cc
|
| diff --git a/ash/common/system/chromeos/power/power_status_view.cc b/ash/common/system/chromeos/power/power_status_view.cc
|
| index 17ee1df07440b4bbcb4085b04563ab4a33ce5636..bcc80914a95f8d59b5cd5a82be5f37de7f4e7169 100644
|
| --- a/ash/common/system/chromeos/power/power_status_view.cc
|
| +++ b/ash/common/system/chromeos/power/power_status_view.cc
|
| @@ -75,9 +75,8 @@ void PowerStatusView::LayoutView() {
|
| AddChildView(icon_);
|
| } else {
|
| // PowerStatusView is left aligned on the system tray pop up item.
|
| - views::BoxLayout* layout =
|
| - new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
|
| - kTrayPopupPaddingBetweenItems);
|
| + views::BoxLayout* layout = new views::BoxLayout(
|
| + views::BoxLayout::kHorizontal, 0, 0, kTrayPopupPaddingBetweenItems);
|
| SetLayoutManager(layout);
|
|
|
| icon_ = new ash::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
|
| @@ -108,8 +107,9 @@ void PowerStatusView::UpdateText() {
|
| battery_time_status =
|
| l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING);
|
| } else {
|
| - base::TimeDelta time = status.IsBatteryCharging() ?
|
| - status.GetBatteryTimeToFull() : status.GetBatteryTimeToEmpty();
|
| + base::TimeDelta time = status.IsBatteryCharging()
|
| + ? status.GetBatteryTimeToFull()
|
| + : status.GetBatteryTimeToEmpty();
|
| if (PowerStatus::ShouldDisplayBatteryTime(time) &&
|
| !status.IsBatteryDischargingOnLinePower()) {
|
| battery_time_status = l10n_util::GetStringFUTF16(
|
|
|