Change PowerStatus::GetBatteryImage to not use ExtractImageRep and scale

ash/common/system/chromeos/power/power_status_view.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/power_status_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/power/tray_power.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
@@ skipping 14 matching lines @@
 
 namespace ash {
 
 // Padding between battery status text and battery icon on default view.
 const int kPaddingBetweenBatteryStatusAndIcon = 3;
 
 PowerStatusView::PowerStatusView(bool default_view_right_align)
     : default_view_right_align_(default_view_right_align),
       percentage_label_(new views::Label),
       separator_label_(new views::Label),
-      time_status_label_(new views::Label),
-      icon_(nullptr) {
+      time_status_label_(new views::Label) {
   if (MaterialDesignController::IsSystemTrayMenuMaterial())
     SetFocusBehavior(FocusBehavior::ALWAYS);
 
   percentage_label_->SetEnabledColor(kHeaderTextColorNormal);
   separator_label_->SetEnabledColor(kHeaderTextColorNormal);
   separator_label_->SetText(base::ASCIIToUTF16(" - "));
   LayoutView();
   PowerStatus::Get()->AddObserver(this);
   OnPowerStatusChanged();
 }
 
 PowerStatusView::~PowerStatusView() {
   PowerStatus::Get()->RemoveObserver(this);
 }
 
 void PowerStatusView::OnPowerStatusChanged() {
   UpdateText();
-
-  // We do not show a battery icon in the material design system menu.
-  // TODO(tdanderson): Remove the non-MD code and the IconSet enum once
-  // material design is enabled by default. See crbug.com/614453.
-  if (MaterialDesignController::UseMaterialDesignSystemIcons())
-    return;
-
-  const PowerStatus::BatteryImageInfo info =
-      PowerStatus::Get()->GetBatteryImageInfo(PowerStatus::ICON_DARK);
-  if (info != previous_battery_image_info_) {
-    icon_->SetImage(PowerStatus::Get()->GetBatteryImage(info));
-    icon_->SetVisible(true);
-    previous_battery_image_info_ = info;
-  }
 }
 
 void PowerStatusView::LayoutView() {
   if (default_view_right_align_) {
     views::BoxLayout* layout =
         new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
                              kPaddingBetweenBatteryStatusAndIcon);
     SetLayoutManager(layout);
 
     AddChildView(percentage_label_);
     AddChildView(separator_label_);
     AddChildView(time_status_label_);
-
-    icon_ = new views::ImageView;
-    AddChildView(icon_);
+    AddChildView(new views::ImageView);
 
     return;
   }
 
   // TODO(tdanderson): Tweak padding values for material design.
   const bool material_design =
       MaterialDesignController::IsSystemTrayMenuMaterial();
   views::BoxLayout* layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, material_design ? 12 : 0, 0,
       kTrayPopupPaddingBetweenItems);
   SetLayoutManager(layout);
 
-  if (!material_design) {
-    icon_ = TrayPopupUtils::CreateMainImageView();
-    AddChildView(icon_);
-  }
+  if (!material_design)
+    AddChildView(TrayPopupUtils::CreateMainImageView());
 
   AddChildView(percentage_label_);
   AddChildView(separator_label_);
   AddChildView(time_status_label_);
 }
 
 void PowerStatusView::UpdateText() {
   const PowerStatus& status = *PowerStatus::Get();
   base::string16 battery_percentage;
   base::string16 battery_time_status;
@@ skipping 62 matching lines @@
 
 void PowerStatusView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   if (!MaterialDesignController::IsSystemTrayMenuMaterial())
     return;
 
   node_data->role = ui::AX_ROLE_LABEL_TEXT;
   node_data->SetName(accessible_name_);
 }
 
 }  // namespace ash