Implement remaining SkBitmapOperations as ImageSkiaOperations

ash/system/web_notification/web_notification_tray.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/web_notification/web_notification_tray.h"
 
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia_operations.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.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/painter.h"
@@ skipping 18 matching lines @@
 const int kWebNotificationWidth = 400;
 const int kWebNotificationButtonWidth = 32;
 const int kWebNotificationIconSize = 40;
 
 // Menu constants
 const int kTogglePermissionCommand = 0;
 const int kToggleExtensionCommand = 1;
 const int kShowSettingsCommand = 2;
 
 // The image has three icons: 1 notifiaction, 2 notifications, and 3+.
-SkBitmap GetNotificationImage(int notification_count) {
-  SkBitmap image;
-  gfx::Image all = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      IDR_AURA_UBER_TRAY_WEB_NOTIFICATON);
+gfx::ImageSkia GetNotificationImage(int notification_count) {
+  const gfx::ImageSkia* image = ui::ResourceBundle::GetSharedInstance().
+      GetImageSkiaNamed(IDR_AURA_UBER_TRAY_WEB_NOTIFICATON);
   int image_index = notification_count - 1;
   image_index = std::max(0, std::min(image_index, 2));
-  SkIRect region = SkIRect::MakeXYWH(
+  gfx::Rect region(
       0, image_index * kNotificationImageIconHeight,
       kNotificationImageIconWidth, kNotificationImageIconHeight);
-  all.ToSkBitmap()->extractSubset(&image, region);
-  return image;
+  return gfx::ImageSkiaOperations::ExtractSubset(*image, region);
 }
 
 }  // namespace
 
 namespace ash {
 
 namespace internal {
 
 struct WebNotification {
   WebNotification(const std::string& i,
@@ skipping 745 matching lines @@
 int WebNotificationTray::GetNotificationCount() const {
   return notification_list()->notifications().size();
 }
 
 void WebNotificationTray::UpdateIcon() {
   int count = GetNotificationCount();
   if (count == 0 ||
       status_area_widget_->login_status() == user::LOGGED_IN_LOCKED) {
     SetVisible(false);
   } else {
-    icon_->SetImage(gfx::ImageSkia(GetNotificationImage(count)));
+    icon_->SetImage(GetNotificationImage(count));
     SetVisible(true);
   }
   PreferredSizeChanged();
 }
 
 void WebNotificationTray::UpdateBubbleAndIcon() {
   UpdateIcon();
   if (!bubble())
     return;
   if (GetNotificationCount() == 0)
     status_area_widget_->HideWebNotificationBubble();
   else
     bubble_->ScheduleUpdate();
 }
 
 }  // namespace ash