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

ui/oak/oak_window.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_OAK_OAK_WINDOW_H_
 #define UI_OAK_OAK_WINDOW_H_
 #pragma once
 
 #include "ui/oak/oak_tree_model.h"
 #include "ui/views/controls/tree/tree_view_controller.h"
@@ skipping 15 matching lines @@
   OakWindow();
   virtual ~OakWindow();
 
   static views::Widget* instance;
 
   // Overridden from views::WidgetDelegateView:
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
-  virtual SkBitmap GetWindowIcon() OVERRIDE;
+  virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
   virtual bool ShouldShowWindowIcon() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
 
  private:
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) OVERRIDE;
   virtual void Layout() OVERRIDE;
@@ skipping 13 matching lines @@
   scoped_ptr<OakDetailsModel> details_model_;
   views::View* details_container_;
 
   DISALLOW_COPY_AND_ASSIGN(OakWindow);
 };
 
 }  // namespace internal
 }  // namespace oak
 
 #endif  // UI_OAK_OAK_WINDOW_H_