ash: Add vertical spacing to multi-line text in tray.

ash/system/power/tray_power.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/power/tray_power.h"
 
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 85 matching lines @@
 
     SetImage(image);
   }
 
   PowerSupplyStatus supply_status_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerTrayView);
 };
 
 // This view is used only for the popup.
-class PowerPopupView : public views::Label {
+class PowerPopupView : public views::View {
  public:
   PowerPopupView() {
-    SetHorizontalAlignment(ALIGN_RIGHT);
-    SetMultiLine(true);
+    status_label_ = new views::Label;
+    status_label_->SetHorizontalAlignment(views::Label::ALIGN_RIGHT);
+    time_label_ = new views::Label;
+    time_label_->SetHorizontalAlignment(views::Label::ALIGN_RIGHT);
     UpdateText();
+
+    SetLayoutManager(
+        new views::BoxLayout(
+            views::BoxLayout::kVertical, 0, 0, kTrayPopupTextSpacingVertical));
+    AddChildView(status_label_);
+    AddChildView(time_label_);
   }
 
   virtual ~PowerPopupView() {
   }
 
   void UpdatePowerStatus(const PowerSupplyStatus& status) {
     supply_status_ = status;
     // Sanitize.
     if (supply_status_.battery_is_full)
       supply_status_.battery_percentage = 100.0;
 
     UpdateText();
   }
 
  private:
   void UpdateText() {
     if (supply_status_.is_calculating_battery_time) {
-      SetText(l10n_util::GetStringFUTF16(supply_status_.line_power_on ?
-          IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING_ON :
-          IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING_OFF,
-          base::IntToString16(
-              static_cast<int>(supply_status_.battery_percentage))));
+      status_label_->SetText(
+          l10n_util::GetStringFUTF16(
+              IDS_ASH_STATUS_TRAY_BATTERY_PERCENT,
+              base::IntToString16(
+                  static_cast<int>(supply_status_.battery_percentage))));
+      time_label_->SetText(
+          ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
+              supply_status_.line_power_on ?
+                  IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING_ON :
+                  IDS_ASH_STATUS_TRAY_BATTERY_CALCULATING_OFF));
       return;
     }
 
     base::TimeDelta time = base::TimeDelta::FromSeconds(
         supply_status_.line_power_on ?
         supply_status_.battery_seconds_to_full :
         supply_status_.battery_seconds_to_empty);
     int hour = time.InHours();
     int min = (time - base::TimeDelta::FromHours(hour)).InMinutes();
     if (hour || min) {
-      SetText(l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_BATTERY_STATUS,
-          base::IntToString16(
-              static_cast<int>(supply_status_.battery_percentage)),
-          base::IntToString16(hour),
-          base::IntToString16(min)));
+      status_label_->SetText(
+          l10n_util::GetStringFUTF16(
+              IDS_ASH_STATUS_TRAY_BATTERY_PERCENT,
+              base::IntToString16(
+                  static_cast<int>(supply_status_.battery_percentage))));
+      time_label_->SetText(
+          l10n_util::GetStringFUTF16(
+              supply_status_.line_power_on ?
+                  IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL :
+                  IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_EMPTY,
+              base::IntToString16(hour),
+              base::IntToString16(min)));
     } else {
       if (supply_status_.line_power_on) {
-        SetText(ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
-            IDS_ASH_STATUS_TRAY_BATTERY_FULL));
+        status_label_->SetText(
+            ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
+                IDS_ASH_STATUS_TRAY_BATTERY_FULL));
       } else {
         // Completely discharged? ... ha?
-        SetText(string16());
+        status_label_->SetText(string16());
       }
+      time_label_->SetText(string16());
     }
   }
 
+  views::Label* status_label_;
+  views::Label* time_label_;
+
   PowerSupplyStatus supply_status_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerPopupView);
 };
 
 }  // namespace tray
 
 TrayPower::TrayPower()
     : power_(NULL),
       power_tray_(NULL) {
 }
 
 TrayPower::~TrayPower() {
 }
 
 views::View* TrayPower::CreateTrayView(user::LoginStatus status) {
   // There may not be enough information when this is created about whether
   // there is a battery or not. So always create this, and adjust visibility as
   // necessary.
   PowerSupplyStatus power_status =
       ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
   power_tray_.reset(new tray::PowerTrayView());
   power_tray_->UpdatePowerStatus(power_status);
   return power_tray_.get();
 }
 
 views::View* TrayPower::CreateDefaultView(user::LoginStatus status) {
-  date_.reset(new tray::DateView(tray::DateView::DATE));
+  date_.reset(new tray::DateView());
 
   views::View* container = new views::View;
   views::BoxLayout* layout = new views::BoxLayout(views::BoxLayout::kHorizontal,
       0, 0, 0);
 
   layout->set_spread_blank_space(true);
   container->SetLayoutManager(layout);
   container->set_background(views::Background::CreateSolidBackground(
       kHeaderBackgroundColor));
   HoverHighlightView* view = new HoverHighlightView(NULL);
@@ skipping 50 matching lines @@
 
 void TrayPower::OnPowerStatusChanged(const PowerSupplyStatus& status) {
   if (power_tray_.get())
     power_tray_->UpdatePowerStatus(status);
   if (power_.get())
     power_->UpdatePowerStatus(status);
 }
 
 }  // namespace internal
 }  // namespace ash