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

ui/oak/oak_window.cc

 // 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.
 
 #include "ui/oak/oak_window.h"
 
-#include "ui/oak/oak.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
+#include "ui/oak/oak.h"
 #include "ui/oak/oak_aura_window_display.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace oak {
 namespace internal {
 namespace {
 const SkColor kBorderColor = SkColorSetRGB(0xCC, 0xCC, 0xCC);
@@ skipping 26 matching lines @@
 }
 
 string16 OakWindow::GetWindowTitle() const {
   return ASCIIToUTF16("Oak");
 }
 
 views::View* OakWindow::GetContentsView() {
   return this;
 }
 
-SkBitmap OakWindow::GetWindowIcon() {
+gfx::ImageSkia OakWindow::GetWindowIcon() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return *rb.GetImageNamed(IDR_OAK).ToSkBitmap();
+  return *rb.GetImageNamed(IDR_OAK).ToImageSkia();
 }
 
 bool OakWindow::ShouldShowWindowIcon() const {
   return true;
 }
 
 void OakWindow::DeleteDelegate() {
   instance = NULL;
 }
 
@@ skipping 76 matching lines @@
 void ShowOakWindow() {
   if (!internal::OakWindow::instance) {
     internal::OakWindow::instance =
         views::Widget::CreateWindowWithBounds(new internal::OakWindow,
                                               gfx::Rect(10, 10, 500, 500));
   }
   internal::OakWindow::instance->Show();
 }
 
 }  // namespace oak