More web contents dragging.

chrome/browser/gtk/tabs/tab_strip_gtk.cc

 // Copyright (c) 2009 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 "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/dnd_registry.h"
+#include "chrome/browser/gtk/gtk_dnd_util.h"
 #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gtk_util.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
 #if defined(LINUX2)
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 442 matching lines @@
   model_->AddObserver(this);
 
   tabstrip_.Own(gtk_fixed_new());
   gtk_widget_set_size_request(tabstrip_.get(), -1,
                               TabGtk::GetMinimumUnselectedSize().height());
   gtk_widget_set_app_paintable(tabstrip_.get(), TRUE);
   gtk_drag_dest_set(tabstrip_.get(), GTK_DEST_DEFAULT_ALL,
                     NULL, 0,
                     static_cast<GdkDragAction>(
                         GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK));
-  dnd::SetDestTargetListFromCodeMask(tabstrip_.get(),
-                                     dnd::X_CHROME_TEXT_URI_LIST |
-                                     dnd::X_CHROME_TEXT_PLAIN);
+  GtkDndUtil::SetDestTargetListFromCodeMask(tabstrip_.get(),
+                                            GtkDndUtil::X_CHROME_TEXT_URI_LIST |
+                                            GtkDndUtil::X_CHROME_TEXT_PLAIN);
 
   g_signal_connect(G_OBJECT(tabstrip_.get()), "expose-event",
                    G_CALLBACK(OnExpose), this);
   g_signal_connect(G_OBJECT(tabstrip_.get()), "size-allocate",
                      G_CALLBACK(OnSizeAllocate), this);
   g_signal_connect(G_OBJECT(tabstrip_.get()), "drag-motion",
                    G_CALLBACK(OnDragMotion), this);
   g_signal_connect(G_OBJECT(tabstrip_.get()), "drag-drop",
                    G_CALLBACK(OnDragDrop), this);
   g_signal_connect(G_OBJECT(tabstrip_.get()), "drag-leave",
@@ skipping 1053 matching lines @@
 }
 
 // static
 gboolean TabStripGtk::OnDragDataReceived(GtkWidget* widget,
                                          GdkDragContext* context,
                                          gint x, gint y,
                                          GtkSelectionData* data,
                                          guint info, guint time,
                                          TabStripGtk* tabstrip) {
   // TODO(jhawkins): Parse URI lists.
-  if (info == dnd::X_CHROME_TEXT_PLAIN) {
+  if (info == GtkDndUtil::X_CHROME_TEXT_PLAIN) {
     tabstrip->CompleteDrop(data->data);
     gtk_drag_finish(context, TRUE, TRUE, time);
   }
 
   return TRUE;
 }
 
 // static
 void TabStripGtk::OnNewTabClicked(GtkWidget* widget, TabStripGtk* tabstrip) {
   tabstrip->model_->delegate()->AddBlankTab(true);
@@ skipping 43 matching lines @@
   DCHECK(browser);  // In order for the user to click on the tab there should
                     // be an active browser.
   TabOverviewTypes::Message message;
   message.set_type(TabOverviewTypes::Message::WM_SWITCH_TO_OVERVIEW_MODE);
   GtkWidget* browser_widget = GTK_WIDGET(
       static_cast<BrowserWindowGtk*>(browser->window())->GetNativeHandle());
   message.set_param(0, x11_util::GetX11WindowFromGtkWidget(browser_widget));
   TabOverviewTypes::instance()->SendMessage(message);
 }
 #endif