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

chrome/browser/download/download_util.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.
 //
 // Download utility implementation
 
 #define _USE_MATH_DEFINES  // For VC++ to get M_PI. This has to be first.
 
 #include "chrome/browser/download/download_util.h"
 
@@ skipping 41 matching lines @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
 
 #include "base/win/windows_version.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
+#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/custom_drag.h"
 #include "chrome/browser/ui/gtk/unity_service.h"
 #endif  // defined(TOOLKIT_GTK)
 
 #if defined(OS_WIN) && !defined(USE_AURA)
@@ skipping 305 matching lines @@
 void DragDownload(const DownloadItem* download,
                   gfx::Image* icon,
                   gfx::NativeView view) {
   DCHECK(download);
 
   // Set up our OLE machinery
   ui::OSExchangeData data;
 
   if (icon) {
     drag_utils::CreateDragImageForFile(
-        download->GetFileNameToReportUser(), icon->ToSkBitmap(), &data);
+        download->GetFileNameToReportUser(), icon->ToImageSkia(), &data);
   }
 
   const FilePath full_path = download->GetFullPath();
   data.SetFilename(full_path);
 
   std::string mime_type = download->GetMimeType();
   if (mime_type.empty())
     net::GetMimeTypeFromFile(full_path, &mime_type);
 
   // Add URL so that we can load supported files when dragged to WebContents.
@@ skipping 255 matching lines @@
   UMA_HISTOGRAM_ENUMERATION(
       "Download.CountsChrome", type, CHROME_DOWNLOAD_COUNT_TYPES_LAST_ENTRY);
 }
 
 void RecordDownloadSource(ChromeDownloadSource source) {
   UMA_HISTOGRAM_ENUMERATION(
       "Download.SourcesChrome", source, CHROME_DOWNLOAD_SOURCE_LAST_ENTRY);
 }
 
 }  // namespace download_util