More web contents dragging.

chrome/browser/gtk/browser_toolbar_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/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/base_paths_linux.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/gtk/back_forward_button_gtk.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/custom_button.h"
-#include "chrome/browser/gtk/dnd_registry.h"
 #include "chrome/browser/gtk/go_button_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
+#include "chrome/browser/gtk/gtk_dnd_util.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_type.h"
@@ skipping 308 matching lines @@
   GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
 
   return button;
 }
 
 void BrowserToolbarGtk::SetUpDragForHomeButton() {
   // TODO(estade): we should use a custom drag-drop handler so that we can
   // prefer URIs over plain text when both are available.
   gtk_drag_dest_set(home_->widget(), GTK_DEST_DEFAULT_ALL,
                     NULL, 0, GDK_ACTION_COPY);
-  dnd::SetDestTargetListFromCodeMask(home_->widget(),
-                                     dnd::X_CHROME_TEXT_PLAIN |
-                                     dnd::X_CHROME_TEXT_URI_LIST);
+  GtkDndUtil::SetDestTargetListFromCodeMask(home_->widget(),
+                                            GtkDndUtil::X_CHROME_TEXT_PLAIN |
+                                            GtkDndUtil::X_CHROME_TEXT_URI_LIST);
 
   g_signal_connect(home_->widget(), "drag-data-received",
                    G_CALLBACK(OnDragDataReceived), this);
 }
 
 // static
 gboolean BrowserToolbarGtk::OnToolbarExpose(GtkWidget* widget,
                                             GdkEventExpose* e,
                                             BrowserToolbarGtk* toolbar) {
   cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
@@ skipping 51 matching lines @@
   menu->Popup(button, reinterpret_cast<GdkEvent*>(event));
 
   return TRUE;
 }
 
 // static
 void BrowserToolbarGtk::OnDragDataReceived(GtkWidget* widget,
     GdkDragContext* drag_context, gint x, gint y,
     GtkSelectionData* data, guint info, guint time,
     BrowserToolbarGtk* toolbar) {
-  if (info != dnd::X_CHROME_TEXT_PLAIN) {
+  if (info != GtkDndUtil::X_CHROME_TEXT_PLAIN) {
     NOTIMPLEMENTED() << "Only support plain text drops for now, sorry!";
     return;
   }
 
   GURL url(reinterpret_cast<char*>(data->data));
-  if (!url.is_valid()) {
-     // FIXME: remove this
-    NOTIMPLEMENTED() << "invalid url: " << url.spec();
+  if (!url.is_valid())
     return;
-  }
 
   bool url_is_newtab = url.spec() == chrome::kChromeUINewTabURL;
   toolbar->profile_->GetPrefs()->SetBoolean(prefs::kHomePageIsNewTabPage,
                                             url_is_newtab);
   if (!url_is_newtab) {
     toolbar->profile_->GetPrefs()->SetString(prefs::kHomePage,
                                              UTF8ToWide(url.spec()));
   }
 }
 
 void BrowserToolbarGtk::InitNineBox() {
   // TODO(estade): use |profile_|?
   background_ninebox_.reset(new NineBox(
       browser_->profile()->GetThemeProvider(),
       0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0));
 }