Render Ash material design battery image icon without PNGs

ash/common/system/chromeos/power/power_status_view.cc

Index: ash/common/system/chromeos/power/power_status_view.cc
diff --git a/ash/common/system/chromeos/power/power_status_view.cc b/ash/common/system/chromeos/power/power_status_view.cc
index a30ce2c45022b41134f8ecad63c01a57de244230..17ee1df07440b4bbcb4085b04563ab4a33ce5636 100644
--- a/ash/common/system/chromeos/power/power_status_view.cc
+++ b/ash/common/system/chromeos/power/power_status_view.cc
@@ -4,6 +4,7 @@
 
 #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"
@@ -43,11 +44,17 @@ PowerStatusView::~PowerStatusView() {
 
 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;
   }