Simplify layout of tray items and fix spacing for MD.

ash/common/system/chromeos/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/common/system/chromeos/power/tray_power.h"
 
 #include <utility>
 
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "ash/common/system/chromeos/power/battery_notification.h"
 #include "ash/common/system/chromeos/power/dual_role_notification.h"
 #include "ash/common/system/date/date_view.h"
 #include "ash/common/system/system_notifier.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
@@ skipping 55 matching lines @@
   LOG(WARNING) << "Showing " << GetNotificationStateString(state)
                << " notification. No charger connected."
                << " Remaining time: " << remaining_minutes << " minutes.";
 }
 
 }  // namespace
 
 namespace tray {
 
 // This view is used only for the tray.
-class PowerTrayView : public views::ImageView {
+class PowerTrayView : public TrayItemView {
  public:
-  PowerTrayView() { UpdateImage(); }
+  explicit PowerTrayView(SystemTrayItem* owner) : TrayItemView(owner) {
+    CreateImageView();
+    UpdateImage();
+  }
 
   ~PowerTrayView() override {}
 
   // Overriden from views::View.
   void GetAccessibleState(ui::AXViewState* state) override {
     state->name = accessible_name_;
     state->role = ui::AX_ROLE_BUTTON;
   }
 
   void UpdateStatus(bool battery_alert) {
     UpdateImage();
     SetVisible(PowerStatus::Get()->IsBatteryPresent());
 
     if (battery_alert) {
       accessible_name_ = PowerStatus::Get()->GetAccessibleNameString(true);
       NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
     }
   }
 
  private:
   void UpdateImage() {
     const PowerStatus::BatteryImageInfo info =
         PowerStatus::Get()->GetBatteryImageInfo(PowerStatus::ICON_LIGHT);
     if (info != previous_image_info_) {
-      SetImage(PowerStatus::Get()->GetBatteryImage(info));
+      image_view()->SetImage(PowerStatus::Get()->GetBatteryImage(info));
       previous_image_info_ = info;
     }
   }
 
   base::string16 accessible_name_;
 
   // Information about the last-used image. Cached to avoid unnecessary updates
   // (http://crbug.com/589348).
   PowerStatus::BatteryImageInfo previous_image_info_;
 
@@ skipping 25 matching lines @@
 TrayPower::~TrayPower() {
   PowerStatus::Get()->RemoveObserver(this);
   message_center_->RemoveNotification(kUsbNotificationId, false);
 }
 
 views::View* TrayPower::CreateTrayView(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.
   CHECK(power_tray_ == NULL);
-  power_tray_ = new tray::PowerTrayView();
+  power_tray_ = new tray::PowerTrayView(this);
   power_tray_->UpdateStatus(false);
   return power_tray_;
 }
 
 views::View* TrayPower::CreateDefaultView(LoginStatus status) {
   // Make sure icon status is up to date. (Also triggers stub activation).
   PowerStatus::Get()->RequestStatusUpdate();
   return NULL;
 }
 
@@ skipping 173 matching lines @@
   }
   NOTREACHED();
   return false;
 }
 
 void TrayPower::NotifyUsbNotificationClosedByUser() {
   usb_notification_dismissed_ = true;
 }
 
 }  // namespace ash