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

ui/views/widget/native_widget_win.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/views/widget/native_widget_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_source.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/l10n/l10n_util_win.h"
+#include "ui/base/native_theme/native_theme_win.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_paint.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/icon_util.h"
-#include "ui/base/native_theme/native_theme_win.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/accessibility/native_view_accessibility_win.h"
 #include "ui/views/controls/native_control_win.h"
 #include "ui/views/controls/textfield/native_textfield_views.h"
 #include "ui/views/drag_utils.h"
 #include "ui/views/focus/accelerator_handler.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/focus/widget_focus_manager.h"
 #include "ui/views/ime/input_method_win.h"
@@ skipping 669 matching lines @@
     else
       *show_state = ui::SHOW_STATE_NORMAL;
   }
 }
 
 void NativeWidgetWin::SetWindowTitle(const string16& title) {
   SetWindowText(GetNativeView(), title.c_str());
   SetAccessibleName(title);
 }
 
-void NativeWidgetWin::SetWindowIcons(const SkBitmap& window_icon,
-                                     const SkBitmap& app_icon) {
+void NativeWidgetWin::SetWindowIcons(const gfx::ImageSkia& window_icon,
+                                     const gfx::ImageSkia& app_icon) {
   if (!window_icon.isNull()) {
     HICON windows_icon = IconUtil::CreateHICONFromSkBitmap(window_icon);
     // We need to make sure to destroy the previous icon, otherwise we'll leak
     // these GDI objects until we crash!
     HICON old_icon = reinterpret_cast<HICON>(
         SendMessage(GetNativeView(), WM_SETICON, ICON_SMALL,
                     reinterpret_cast<LPARAM>(windows_icon)));
     if (old_icon)
       DestroyIcon(old_icon);
   }
@@ skipping 1985 matching lines @@
   return (GetKeyState(VK_LBUTTON) & 0x80) ||
     (GetKeyState(VK_RBUTTON) & 0x80) ||
     (GetKeyState(VK_MBUTTON) & 0x80) ||
     (GetKeyState(VK_XBUTTON1) & 0x80) ||
     (GetKeyState(VK_XBUTTON2) & 0x80);
 }
 
 }  // namespace internal
 
 }  // namespace views