Remove ImageSkia::empty and ImageSkia::extractSubset

ash/system/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/system/power/tray_power.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/power/power_status_view.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_notification_view.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 82 matching lines @@
       notification_state_(NOTIFICATION_NONE) {
 }
 
 TrayPower::~TrayPower() {
 }
 
 // static
 gfx::ImageSkia TrayPower::GetBatteryImage(
     const PowerSupplyStatus& supply_status,
     IconSet icon_set) {
-  gfx::ImageSkia image;
   gfx::Image all = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
       icon_set == ICON_DARK ?
       IDR_AURA_UBER_TRAY_POWER_SMALL_DARK : IDR_AURA_UBER_TRAY_POWER_SMALL);
 
   int image_index = 0;
   if (supply_status.battery_percentage >= 100) {
     image_index = kNumPowerImages - 1;
   } else if (!supply_status.battery_is_present) {
     image_index = kNumPowerImages;
   } else {
     double percentage = supply_status.is_calculating_battery_time ? 100.0 :
         supply_status.battery_percentage;
     image_index = static_cast<int>(percentage / 100.0 * (kNumPowerImages - 1));
     image_index = std::max(std::min(image_index, kNumPowerImages - 2), 0);
   }
 
   // TODO(mbolohan): Remove the 2px offset when the assets are centered. See
   // crbug.com/119832.
-  SkIRect region = SkIRect::MakeXYWH(
+  gfx::Rect region(
       (supply_status.line_power_on ? kBatteryImageWidth : 0) + 2,
       image_index * kBatteryImageHeight,
       kBatteryImageWidth - 2, kBatteryImageHeight);
-  all.ToImageSkia()->extractSubset(&image, region);
-  return image;
+  return gfx::ImageSkiaOperations::ExtractSubset(*all.ToImageSkia(), region);
 }
 
 views::View* TrayPower::CreateTrayView(user::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.
   PowerSupplyStatus power_status =
       ash::Shell::GetInstance()->tray_delegate()->GetPowerSupplyStatus();
   CHECK(power_tray_ == NULL);
   power_tray_ = new tray::PowerTrayView();
@@ skipping 85 matching lines @@
       return false;
     case NOTIFICATION_CRITICAL:
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace ash