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

chrome/browser/ui/views/frame/opaque_browser_frame_view.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 CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
@@ skipping 56 matching lines @@
   virtual void Layout() OVERRIDE;
   virtual bool HitTest(const gfx::Point& l) const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event)
       OVERRIDE;
 
   // Overridden from TabIconView::TabIconViewModel:
   virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
-  virtual SkBitmap GetFaviconForTabIconView() OVERRIDE;
+  virtual gfx::ImageSkia GetFaviconForTabIconView() OVERRIDE;
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
   // Creates, adds and returns a new image button with |this| as its listener.
   // Memory is owned by the caller.
-  views::ImageButton* InitWindowCaptionButton(int normal_bitmap_id,
-                                              int hot_bitmap_id,
-                                              int pushed_bitmap_id,
-                                              int mask_bitmap_id,
+  views::ImageButton* InitWindowCaptionButton(int normal_image_id,
+                                              int hot_image_id,
+                                              int pushed_image_id,
+                                              int mask_image_id,
                                               int accessibility_string_id);
 
   // Returns the thickness of the border that makes up the window frame edges.
   // This does not include any client edge.  If |restored| is true, acts as if
   // the window is restored regardless of the real mode.
   int FrameBorderThickness(bool restored) const;
 
   // Returns the height of the top resize area.  This is smaller than the frame
   // border height in order to increase the window draggable area.
   int TopResizeHeight() const;
@@ skipping 23 matching lines @@
   // also paint the background of the titlebar area, since the top frame border
   // and titlebar background are a contiguous component.
   void PaintRestoredFrameBorder(gfx::Canvas* canvas);
   void PaintMaximizedFrameBorder(gfx::Canvas* canvas);
   void PaintTitleBar(gfx::Canvas* canvas);
   void PaintToolbarBackground(gfx::Canvas* canvas);
   void PaintRestoredClientEdge(gfx::Canvas* canvas);
 
   // Compute aspects of the frame needed to paint the frame background.
   SkColor GetFrameColor() const;
-  SkBitmap* GetFrameBitmap() const;
-  SkBitmap* GetFrameOverlayBitmap() const;
+  gfx::ImageSkia* GetFrameImage() const;
+  gfx::ImageSkia* GetFrameOverlayImage() const;
   int GetTopAreaHeight() const;
 
   // Layout various sub-components of this view.
   void LayoutWindowControls();
   void LayoutTitleBar();
   void LayoutAvatar();
 
   // Returns the bounds of the client area for the specified view size.
   gfx::Rect CalculateClientAreaBounds(int width, int height) const;
 
@@ skipping 17 matching lines @@
 
   content::NotificationRegistrar registrar_;
 
   // Background painter for the window frame.
   scoped_ptr<views::FrameBackground> frame_background_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_