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

content/browser/web_contents/web_contents_drag_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 "content/browser/web_contents/web_contents_drag_win.h"
 
 #include <windows.h>
 
 #include <string>
 
@@ skipping 10 matching lines @@
 #include "content/browser/web_contents/web_drag_source_win.h"
 #include "content/browser/web_contents/web_drag_utils_win.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
 #include "net/base/net_util.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "ui/base/dragdrop/drag_utils.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/webdropdata.h"
 
 using content::BrowserThread;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebDragOperationCopy;
 using WebKit::WebDragOperationLink;
 using WebKit::WebDragOperationMove;
 
 namespace {
@@ skipping 249 matching lines @@
     if (!drop_data.custom_data.empty()) {
       Pickle pickle;
       ui::WriteCustomDataToPickle(drop_data.custom_data, &pickle);
       data.SetPickledData(ui::ClipboardUtil::GetWebCustomDataFormat()->cfFormat,
                           pickle);
     }
   }
 
   // Set drag image.
   if (!image.isNull()) {
-    drag_utils::SetDragImageOnDataObject(
-        image, gfx::Size(image.width(), image.height()), image_offset, &data);
+    drag_utils::SetDragImageOnDataObject(gfx::ImageSkia(image),
+        gfx::Size(image.width(), image.height()), image_offset, &data);
   }
 
   // We need to enable recursive tasks on the message loop so we can get
   // updates while in the system DoDragDrop loop.
   DWORD effect;
   {
     MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
     DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
                drag_source_,
                web_drag_utils_win::WebDragOpMaskToWinDragOpMask(ops),
@@ skipping 51 matching lines @@
 void WebContentsDragWin::OnDataObjectDisposed() {
   DCHECK(drag_drop_thread_id_ == base::PlatformThread::CurrentId());
 
   // The drag-and-drop thread is only closed after OLE is done with
   // DataObjectImpl.
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&WebContentsDragWin::CloseThread, this));
 }