Move common notification layout to base class

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/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/power/power_supply_status.h"
@@ skipping 111 matching lines @@
 };
 
 // This view is used only for the popup.
 class PowerStatusView : public views::View {
  public:
   enum ViewType {
     VIEW_DEFAULT,
     VIEW_NOTIFICATION
   };
 
-  explicit PowerStatusView(ViewType view_type) {
+  explicit PowerStatusView(ViewType view_type) : icon_(NULL) {
     status_label_ = new views::Label;
-    status_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     time_label_ = new views::Label;
-    time_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-
-    icon_ = new views::ImageView;
-
-    AddChildView(status_label_);
-    AddChildView(time_label_);
-    AddChildView(icon_);
 
     if (view_type == VIEW_DEFAULT)
       LayoutDefaultView();
     else
       LayoutNotificationView();
 
     Update();
-
-    set_border(views::Border::CreateEmptyBorder(
-        kPaddingVertical, kTrayPopupPaddingHorizontal,
-        kPaddingVertical, kTrayPopupPaddingHorizontal));
   }
 
   virtual ~PowerStatusView() {
   }
 
   void UpdatePowerStatus(const PowerSupplyStatus& status) {
     supply_status_ = status;
     // Sanitize.
     if (supply_status_.battery_is_full)
       supply_status_.battery_percentage = 100.0;
 
     Update();
   }
 
  private:
   void LayoutDefaultView() {
+    set_border(views::Border::CreateEmptyBorder(
+        kPaddingVertical, kTrayPopupPaddingHorizontal,
+        kPaddingVertical, kTrayPopupPaddingHorizontal));
+
+    status_label_->SetHorizontalAlignment(views::Label::ALIGN_RIGHT);
+    time_label_->SetHorizontalAlignment(views::Label::ALIGN_RIGHT);
+
+    icon_ = new views::ImageView;
+
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
 
     views::ColumnSet* columns = layout->AddColumnSet(0);
 
     columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal);
     // Status + Time
     columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                        0, views::GridLayout::USE_PREF, 0, kLabelMinWidth);
 
@@ skipping 12 matching lines @@
     layout->AddView(icon_, 1, 3);  // 3 rows for icon
 
     layout->AddPaddingRow(0, kPaddingVertical/3);
     layout->StartRow(0, 0);
     layout->AddView(time_label_);
 
     layout->AddPaddingRow(0, kPaddingVertical);
   }
 
   void LayoutNotificationView() {
-    const int msg_width = kTrayPopupWidth - kNotificationCloseButtonWidth -
-        kTrayPopupPaddingHorizontal - kNotificationIconWidth;
+    SetLayoutManager(
+        new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
+    status_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+    AddChildView(status_label_);
 
-    views::GridLayout* layout = new views::GridLayout(this);
-    SetLayoutManager(layout);
-
-    views::ColumnSet* columns = layout->AddColumnSet(0);
-
-    // Icon
-    columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
-                       0 /* resize percent */,
-                       views::GridLayout::FIXED,
-                       kNotificationIconWidth, kNotificationIconWidth);
-
-    columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal/2);
-
-    // Status + Time
-    columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
-                       0 /* resize percent */,
-                       views::GridLayout::FIXED, msg_width, msg_width);
-
-    // Layout rows
-    layout->AddPaddingRow(0, kTrayPopupPaddingBetweenItems);
-
-    layout->StartRow(0, 0);
-    layout->AddView(icon_, 1, 2);  // 2 rows for icon
-    layout->AddView(status_label_);
-
-    layout->StartRow(0, 0);
-    layout->SkipColumns(1);
-    layout->AddView(time_label_);
-
-    layout->AddPaddingRow(0, kPaddingVertical);
+    time_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+    AddChildView(time_label_);
   }
 
   void UpdateText() {
     base::TimeDelta time = base::TimeDelta::FromSeconds(
         supply_status_.line_power_on ?
         supply_status_.averaged_battery_time_to_full :
         supply_status_.averaged_battery_time_to_empty);
     int hour = time.InHours();
     int min = (time - base::TimeDelta::FromHours(hour)).InMinutes();
 
@@ skipping 20 matching lines @@
               IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_FULL :
               IDS_ASH_STATUS_TRAY_BATTERY_TIME_UNTIL_EMPTY,
               base::IntToString16(hour),
               base::IntToString16(min)));
     } else {
       time_label_->SetText(string16());
     }
   }
 
   void UpdateIcon() {
-    icon_->SetImage(GetBatteryImage(supply_status_, ICON_DARK));
-    icon_->SetVisible(true);
+    if (icon_) {
+      icon_->SetImage(GetBatteryImage(supply_status_, ICON_DARK));
+      icon_->SetVisible(true);
+    }
   }
 
   void Update() {
     UpdateText();
     UpdateIcon();
   }
 
   views::Label* status_label_;
   views::Label* time_label_;
   views::ImageView* icon_;
 
   PowerSupplyStatus supply_status_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerStatusView);
 };
 
 class PowerNotificationView : public TrayNotificationView {
  public:
   explicit PowerNotificationView(TrayPower* tray)
-      : tray_(tray) {
+      : TrayNotificationView(0),
+        tray_(tray) {
     power_status_view_ =
         new PowerStatusView(PowerStatusView::VIEW_NOTIFICATION);
     InitView(power_status_view_);
   }
 
   void UpdatePowerStatus(const PowerSupplyStatus& status) {
+    SetIconImage(GetBatteryImage(status, ICON_DARK));
     power_status_view_->UpdatePowerStatus(status);
   }
 
   // Overridden from TrayNotificationView:
   virtual void OnClose() OVERRIDE {
     tray_->HideNotificationView();
   }
 
  private:
   TrayPower* tray_;
@@ skipping 107 matching lines @@
       return false;
     case NOTIFICATION_CRITICAL:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash