Render Ash material design battery image icon without PNGs

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/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"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 25 matching lines @@
   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(PowerStatus::ICON_DARK));
+    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);
@@ skipping 79 matching lines @@
   // Move the time_status_label_, separator_label_, and percentage_label_
   // closer to each other.
   if (percentage_label_ && separator_label_ && time_status_label_ &&
       percentage_label_->visible() && time_status_label_->visible()) {
     separator_label_->SetX(percentage_label_->bounds().right() + 1);
     time_status_label_->SetX(separator_label_->bounds().right() + 1);
   }
 }
 
 }  // namespace ash