Change PowerStatus::GetBatteryImage to not use ExtractImageRep and scale

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

 // Copyright (c) 2013 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.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/time_format.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
-#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/paint_vector_icon.h"
 
 namespace ash {
 namespace {
 
 // Updates |proto| to ensure that its fields are consistent.
 void SanitizeProto(power_manager::PowerSupplyProperties* proto) {
   DCHECK(proto);
 
   if (proto->battery_state() ==
@@ skipping 248 matching lines @@
          source.active_by_default() ? DEDICATED_CHARGER : DUAL_ROLE_USB,
          PowerSourceToMessageID(source)});
   }
   return sources;
 }
 
 std::string PowerStatus::GetCurrentPowerSourceID() const {
   return proto_.external_power_source_id();
 }
 
-PowerStatus::BatteryImageInfo PowerStatus::GetBatteryImageInfo(
-    IconSet icon_set) const {
+PowerStatus::BatteryImageInfo PowerStatus::GetBatteryImageInfo() const {
   BatteryImageInfo info;
   CalculateBatteryImageInfo(&info);
   return info;
 }
 
 void PowerStatus::CalculateBatteryImageInfo(BatteryImageInfo* info) const {
   if (!IsUsbChargerConnected() && !IsBatteryPresent()) {
     info->icon_badge = &kSystemTrayBatteryXIcon;
     info->charge_level = 0;
     return;
@@ skipping 16 matching lines @@
   info->charge_level = std::max(charge_state, kMinVisualChargeLevel);
 
   // Use an alert badge if the battery is critically low and does not already
   // have a badge assigned.
   if (GetBatteryPercent() < kCriticalBatteryChargePercentage &&
       !info->icon_badge) {
     info->icon_badge = &kSystemTrayBatteryAlertIcon;
   }
 }
 
-gfx::ImageSkia PowerStatus::GetBatteryImage(
-    const BatteryImageInfo& info) const {
+// static
+gfx::Size PowerStatus::GetBatteryImageSizeInDip() {
+  return gfx::Size(kBatteryCanvasSize, kBatteryCanvasSize);
+}
+
+gfx::ImageSkiaRep PowerStatus::GetBatteryImage(const BatteryImageInfo& info,
+                                               float scale) const {
   const bool use_alert_color =
       (info.charge_level == kMinVisualChargeLevel && !IsLinePowerConnected());
   const SkColor badge_color =
       use_alert_color ? kBatteryAlertColor : kBatteryBadgeColor;
   const SkColor charge_color =
       use_alert_color ? kBatteryAlertColor : kBatteryChargeColor;
-  gfx::Canvas canvas(
-      gfx::Size(kBatteryCanvasSize, kBatteryCanvasSize),
-      display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor(),
-      false);
+
+  gfx::Canvas canvas(GetBatteryImageSizeInDip(), scale, false /* opaque */);
 
   // Paint the battery's base (background) color.
   PaintVectorIcon(&canvas, kSystemTrayBatteryIcon, kBatteryCanvasSize,
                   kBatteryBaseColor);
 
   // Paint the charged portion of the battery. Note that |charge_height| adjusts
   // for the 2dp of padding between the bottom of the battery icon and the
   // bottom edge of |canvas|.
   const int charge_height = info.charge_level + 2;
   gfx::Rect clip_rect(0, kBatteryCanvasSize - charge_height, kBatteryCanvasSize,
                       charge_height);
   canvas.Save();
   canvas.ClipRect(clip_rect);
   PaintVectorIcon(&canvas, kSystemTrayBatteryIcon, kBatteryCanvasSize,
                   charge_color);
   canvas.Restore();
 
   // Paint the badge over top of the battery, if applicable.
   if (info.icon_badge)
     PaintVectorIcon(&canvas, *info.icon_badge, kBatteryCanvasSize, badge_color);
 
-  return gfx::ImageSkia(canvas.ExtractImageRep());
+  return gfx::ImageSkiaRep(canvas.GetBitmap(), scale);
 }
 
 base::string16 PowerStatus::GetAccessibleNameString(
     bool full_description) const {
   if (IsBatteryFull()) {
     return l10n_util::GetStringUTF16(
         IDS_ASH_STATUS_TRAY_BATTERY_FULL_CHARGE_ACCESSIBLE);
   }
 
   base::string16 battery_percentage_accessible = l10n_util::GetStringFUTF16(
@@ skipping 54 matching lines @@
 
 void PowerStatus::PowerChanged(
     const power_manager::PowerSupplyProperties& proto) {
   proto_ = proto;
   SanitizeProto(&proto_);
   for (auto& observer : observers_)
     observer.OnPowerStatusChanged();
 }
 
 }  // namespace ash