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

ui/views/controls/scrollbar/bitmap_scroll_bar.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
 #define UI_VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_
 #pragma once
 
 #include "ui/views/controls/scrollbar/base_scroll_bar.h"
 
 namespace views {
@@ skipping 32 matching lines @@
     THUMB_MIDDLE,
     // The bottom/right segment of the thumb on the scrollbar.
     THUMB_END_CAP,
     // The grippy that is rendered in the center of the thumb.
     THUMB_GRIPPY,
     // The tiled background image of the thumb track.
     THUMB_TRACK,
     PART_COUNT
   };
 
-  // Sets the bitmap to be rendered for the specified part and state.
+  // Sets the image to be rendered for the specified part and state.
   void SetImage(ScrollBarPart part,
                 CustomButton::ButtonState state,
-                SkBitmap* bitmap);
+                gfx::ImageSkia* image_skia);
 
 
   gfx::Rect GetTrackBounds() const;
 
  protected:
   // View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // ScrollBar overrides:
   virtual int GetLayoutSize() const OVERRIDE;
 
   // BaseButton::ButtonListener overrides:
   virtual void ButtonPressed(Button* sender,
                              const views::Event& event) OVERRIDE;
 
  private:
   // Up/Down/Left/Right buttons.
   ImageButton* prev_button_;
   ImageButton* next_button_;
 
   // The thumb needs to be able to access the part images.
   friend BitmapScrollBarThumb;
-  SkBitmap* images_[PART_COUNT][CustomButton::BS_COUNT];
+  gfx::ImageSkia* images_[PART_COUNT][CustomButton::BS_COUNT];
 
   // True if the scroll buttons at each end of the scroll bar should be shown.
   bool show_scroll_buttons_;
 
   DISALLOW_COPY_AND_ASSIGN(BitmapScrollBar);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_