From 53e4ce626d79e6b819f8379ded5a85ceeecdf66d Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 23 May 2012 21:51:09 +0000
Subject: [PATCH] Linux: Fix compile errors.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@646 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef1/libcef/web_drag_source_gtk.cc | 2 +-
 cef1/libcef/web_drop_target_gtk.cc | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cef1/libcef/web_drag_source_gtk.cc b/cef1/libcef/web_drag_source_gtk.cc
index aa2fc334a..4b3eb8843 100644
--- a/cef1/libcef/web_drag_source_gtk.cc
+++ b/cef1/libcef/web_drag_source_gtk.cc
@@ -96,7 +96,7 @@ void WebDragSource::StartDragging(const WebDropData& drop_data,
       event);
   if (!image.isNull()) {
     const SkBitmap& bitmap = image.getSkBitmap();
-    GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
+    GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(bitmap);
     gtk_drag_set_icon_pixbuf(context, pixbuf, image_offset.x, image_offset.y);
     g_object_unref(pixbuf);
   } else {
diff --git a/cef1/libcef/web_drop_target_gtk.cc b/cef1/libcef/web_drop_target_gtk.cc
index 2d64bca0a..bebf14107 100644
--- a/cef1/libcef/web_drop_target_gtk.cc
+++ b/cef1/libcef/web_drop_target_gtk.cc
@@ -202,7 +202,9 @@ void WebDropTarget::OnDragDataReceived(GtkWidget* widget,
           FilePath file_path;
           if (url.SchemeIs("file") &&
               net::FileURLToFilePath(url, &file_path)) {
-            drop_data_->filenames.push_back(UTF8ToUTF16(file_path.value()));
+            drop_data_->filenames.push_back(
+                WebDropData::FileInfo(UTF8ToUTF16(file_path.value()), 
+                                      string16()));
             // This is a hack. Some file managers also populate text/plain with
             // a file URL when dragging files, so we clear it to avoid exposing
             // it to the web content.