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

ui/base/native_theme/native_theme_android.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_ANDROID_H_
 #define UI_BASE_NATIVE_THEME_NATIVE_THEME_ANDROID_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 {
 
 // Android theming API.
 class NativeThemeAndroid : public NativeTheme {
  public:
   // Gets our singleton instance.
@@ skipping 80 matching lines @@
       const ProgressBarExtraParams& progress_bar) const;
 
   // Return true if there is intersection between the |canvas| and the given
   // rectangle.
   bool IntersectsClipRectInt(SkCanvas* canvas,
                              int x,
                              int y,
                              int w,
                              int h) const;
 
-  // Draw the dest rectangle with the given bitmap which might be scaled if its
+  // Draw the dest rectangle with the given image which might be scaled if its
   // size is not same as target rectangle.
   void DrawBitmapInt(SkCanvas* canvas,
-                     const SkBitmap& bitmap,
+                     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;
 
   // Draw the target rectangle with the |bitmap| accroding the given
   // |tile_scale_x| and |tile_scale_y|
   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;
 
   // Return a new color which comes from the |hsv| by adjusting saturate and
@@ skipping 25 matching lines @@
   // Used to return the color of scrollbar based on the color of thumb and
   // track.
   SkColor OutlineColor(SkScalar* hsv1, SkScalar* hsv2) const;
 
   DISALLOW_COPY_AND_ASSIGN(NativeThemeAndroid);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_NATIVE_THEME_NATIVE_THEME_ANDROID_H_