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

chrome/browser/ui/views/tab_icon_view.h

 // Copyright (c) 2011 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_TAB_ICON_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TAB_ICON_VIEW_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "ui/views/view.h"
 
-class SkBitmap;
+namespace gfx {
+class ImageSkia;
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // A view to display a tab favicon or a throbber.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class TabIconView : public views::View {
  public:
   // Classes implement this interface to provide state for the TabIconView.
   class TabIconViewModel {
    public:
     // Returns true if the TabIconView should show a loading animation.
     virtual bool ShouldTabIconViewAnimate() const = 0;
 
     // Returns the favicon to display in the icon view
-    virtual SkBitmap GetFaviconForTabIconView() = 0;
+    virtual gfx::ImageSkia GetFaviconForTabIconView() = 0;
   };
 
   static void InitializeIfNeeded();
 
   explicit TabIconView(TabIconViewModel* provider);
   virtual ~TabIconView();
 
   // Invoke whenever the tab state changes or the throbber should update.
   void Update();
 
@@ skipping 25 matching lines @@
   bool is_light_;
 
   // Current frame of the throbber being painted. This is only used if
   // throbber_running_ is true.
   int throbber_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(TabIconView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TAB_ICON_VIEW_H_