Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

ui/base/native_theme/native_theme_base.h

 // 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_BASE_NATIVE_THEME_NATIVE_THEME_BASE_H_
 #define UI_BASE_NATIVE_THEME_NATIVE_THEME_BASE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "skia/ext/platform_canvas.h"
 #include "ui/base/native_theme/native_theme.h"
 
 namespace gfx {
+class ImageSkia;
 class Rect;
 class Size;
 }
 
 namespace ui {
 
 // Theme support for non-Windows toolkits.
 class NativeThemeBase : public NativeTheme {
  public:
   // NativeTheme implementation:
@@ skipping 95 matching lines @@
       const ProgressBarExtraParams& progress_bar) const;
 
  protected:
   void set_scrollbar_button_length(unsigned int length) {
     scrollbar_button_length_ = length;
   }
 
   bool IntersectsClipRectInt(SkCanvas* canvas,
                              int x, int y, int w, int h) const;
 
-  void DrawBitmapInt(SkCanvas* canvas, const SkBitmap& bitmap,
+  void DrawBitmapInt(SkCanvas* canvas, const gfx::ImageSkia& image,
                      int src_x, int src_y, int src_w, int src_h,
                      int dest_x, int dest_y, int dest_w, int dest_h) const;
 
   void DrawTiledImage(SkCanvas* canvas,
-                      const SkBitmap& bitmap,
+                      const gfx::ImageSkia& image,
                       int src_x, int src_y,
                       float tile_scale_x, float tile_scale_y,
                       int dest_x, int dest_y, int w, int h) const;
 
   SkColor SaturateAndBrighten(SkScalar* hsv,
                               SkScalar saturate_amount,
                               SkScalar brighten_amount) const;
 
  private:
   void DrawVertLine(SkCanvas* canvas,
@@ skipping 16 matching lines @@
 
   unsigned int scrollbar_width_;
   unsigned int scrollbar_button_length_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeThemeBase);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_NATIVE_THEME_NATIVE_THEME_BASE_H_