Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

chrome/browser/ui/views/dropdown_bar_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 "chrome/browser/ui/views/dropdown_bar_view.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // When we are animating, we draw only the top part of the left and right
 // edges to give the illusion that the find dialog is attached to the
 // window during this animation; this is the height of the items we draw.
 const int kAnimatingEdgeHeight = 5;
 
 // Background to paint toolbar background with rounded corners.
 class DropdownBackground : public views::Background {
  public:
   explicit DropdownBackground(BrowserView* browser,
-                              const SkBitmap* left_alpha_mask,
-                              const SkBitmap* right_alpha_mask);
+                              const gfx::ImageSkia* left_alpha_mask,
+                              const gfx::ImageSkia* right_alpha_mask);
   virtual ~DropdownBackground() {}
 
   // Overridden from views::Background.
   virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE;
 
  private:
   BrowserView* browser_view_;
-  const SkBitmap* left_alpha_mask_;
-  const SkBitmap* right_alpha_mask_;
+  const gfx::ImageSkia* left_alpha_mask_;
+  const gfx::ImageSkia* right_alpha_mask_;
 
   DISALLOW_COPY_AND_ASSIGN(DropdownBackground);
 };
 
 DropdownBackground::DropdownBackground(BrowserView* browser_view,
-                                     const SkBitmap* left_alpha_mask,
-                                     const SkBitmap* right_alpha_mask)
+                                     const gfx::ImageSkia* left_alpha_mask,
+                                     const gfx::ImageSkia* right_alpha_mask)
     : browser_view_(browser_view),
       left_alpha_mask_(left_alpha_mask),
       right_alpha_mask_(right_alpha_mask) {
 }
 
 void DropdownBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
   // Find the offset from which to tile the toolbar background image.
   // First, get the origin with respect to the screen.
   gfx::Point origin = view->GetWidget()->GetWindowScreenBounds().origin();
   // Now convert from screen to parent coordinates.
@@ skipping 55 matching lines @@
      OnPaintBackground(&animating_edges);
      OnPaintBorder(&animating_edges);
      canvas->DrawBitmapInt(animating_edges.ExtractBitmap(), bounds().x(),
          animation_offset());
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DropDownBarView, protected:
 
-void DropdownBarView::SetBackground(const SkBitmap* left_alpha_mask,
-                                    const SkBitmap* right_alpha_mask) {
+void DropdownBarView::SetBackground(const gfx::ImageSkia* left_alpha_mask,
+                                    const gfx::ImageSkia* right_alpha_mask) {
   set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask,
       right_alpha_mask));
 }
 
 void DropdownBarView::SetBorder(int left_border_bitmap_id,
                                 int middle_border_bitmap_id,
                                 int right_border_bitmap_id) {
   int border_bitmap_ids[3] = {left_border_bitmap_id, middle_border_bitmap_id,
       right_border_bitmap_id};
   set_border(views::Border::CreateBorderPainter(
       new views::HorizontalPainter(border_bitmap_ids)));
 }