Re-land:

views/widget/drop_target_gtk.cc

 // Copyright (c) 2011 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 "views/widget/drop_target_gtk.h"
 
 #include <algorithm>
 #include <iterator>
 #include <string>
 #include <vector>
@@ skipping 149 matching lines @@
 
 gboolean DropTargetGtk::OnDragDrop(GdkDragContext* context,
                                    gint x,
                                    gint y,
                                    guint time) {
   received_drop_ = true;
   OnDragMotion(context, x, y, time);
   if (!pending_view_) {
     // User isn't over a view, no drop can occur.
     static_cast<WidgetGtk*>(
-        helper_.root_view()->GetWidget())->ResetDropTarget();
+        helper_.root_view()->GetWidget()->native_widget())->ResetDropTarget();
     // WARNING: we've been deleted.
     return FALSE;
   }
 
   if (!waiting_for_data_) {
     // We've got all the data now.
     FinishDrop(context, x, y, time);
     // WARNING: we've been deleted.
     return TRUE;
   }
@@ skipping 58 matching lines @@
   int drag_operation = ui::DragDropTypes::GdkDragActionToDragOperation(
       context->actions);
   drag_operation = helper_.OnDrop(*data_, root_view_location,
                                   drag_operation);
   GdkDragAction gdk_action =
       static_cast<GdkDragAction>(
           ui::DragDropTypes::DragOperationToGdkDragAction(drag_operation));
   gtk_drag_finish(context, gdk_action != 0, (gdk_action & GDK_ACTION_MOVE),
                   time);
 
-  static_cast<WidgetGtk*>(helper_.root_view()->GetWidget())->ResetDropTarget();
+  static_cast<WidgetGtk*>(helper_.root_view()->GetWidget()->native_widget())->
+      ResetDropTarget();
   // WARNING: we've been deleted.
 }
 
 void DropTargetGtk::IntersectFormats(int f1, const std::set<GdkAtom>& cf1,
                                      int* f2, std::set<GdkAtom>* cf2) {
   *f2 = (*f2 & f1);
   std::set<GdkAtom> cf;
   std::set_intersection(
       cf1.begin(), cf1.end(), cf2->begin(), cf2->end(),
       std::insert_iterator<std::set<GdkAtom> >(cf, cf.begin()));
   cf.swap(*cf2);
 }
 
 void DropTargetGtk::RequestFormats(GdkDragContext* context,
                                    int formats,
                                    const std::set<GdkAtom>& custom_formats,
                                    guint time) {
-  GtkWidget* widget =
-      static_cast<WidgetGtk*>(helper_.root_view()->GetWidget())->
-      window_contents();
+  GtkWidget* widget = static_cast<WidgetGtk*>(helper_.root_view()->GetWidget()->
+      native_widget())->window_contents();
 
   const std::set<GdkAtom>& known_formats =
       data_provider().known_custom_formats();
   if ((formats & OSExchangeData::STRING) != 0 &&
       (requested_formats_ & OSExchangeData::STRING) == 0) {
     requested_formats_ |= OSExchangeData::STRING;
     if (known_formats.count(gdk_atom_intern("UTF8_STRING", false))) {
       gtk_drag_get_data(widget, context,
                         gdk_atom_intern("UTF8_STRING", false), time);
     } else if (known_formats.count(gdk_atom_intern("text/plain;charset=utf-8",
@@ skipping 40 matching lines @@
       gtk_drag_get_data(widget, context, *i, time);
     }
   }
 }
 
 OSExchangeDataProviderGtk& DropTargetGtk::data_provider() const {
   return static_cast<OSExchangeDataProviderGtk&>(data_->provider());
 }
 
 }  // namespace views