GTK: add TEXT_URI_LIST as a data type for drags from the omnibox.

chrome/browser/ui/gtk/omnibox/omnibox_view_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 "chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/platform_util.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/view_id_util.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_source.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "third_party/undoview/undo_view.h"
 #include "ui/base/animation/multi_animation.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
@@ skipping 1550 matching lines @@
     g_signal_stop_emission(text_view_, signal_id, 0);
   }
 }
 
 void OmniboxViewGtk::HandleDragDataGet(GtkWidget* widget,
                                        GdkDragContext* context,
                                        GtkSelectionData* selection_data,
                                        guint target_type,
                                        guint time) {
   DCHECK(text_view_);
-  // If GTK put the normal textual version of the selection in our drag data,
-  // put our doctored selection that might have the 'http://' prefix. Also, GTK
-  // is confused about signedness of its datatypes, leading to the weird switch
-  // statement (no set of casts fixes this).
+
   switch (target_type) {
     case GTK_TEXT_BUFFER_TARGET_INFO_TEXT: {
       gtk_selection_data_set_text(selection_data, dragged_text_.c_str(), -1);
+      break;
+    }
+    case ui::TEXT_URI_LIST: {

[Evan Stade, 2011/10/24 22:46:31]

you are still using TEXT_URI_LIST

[SanjoyPal, 2011/10/25 02:45:12]

On 2011/10/24 22:46:31, Evan Stade wrote:
Can you please suggest which target will be appropriate in this case? Is it
CHROME_NAMED_URL? --Thanks.

+      TabContents* current_tab =
+          BrowserList::GetLastActive()->GetSelectedTabContents();
+      string16 tab_title = current_tab->GetTitle();
+      // Pass an empty string if user has edited the URL.
+      if (current_tab->GetURL().spec() != dragged_text_)
+        tab_title = string16();
+      ui::WriteURLWithName(selection_data, GURL(dragged_text_),
+                           tab_title, target_type);
+      break;
     }
   }
 }
 
 void OmniboxViewGtk::HandleDragBegin(GtkWidget* widget,
                                        GdkDragContext* context) {
+  string16 text = UTF8ToUTF16(GetSelectedText());
+
+  if (text.empty())
+    return;
+
+  // Use AdjustTextForCopy to make sure we prefix the text with 'http://'.
+  CharRange selection = GetSelection();
+  GURL url;
+  bool write_url;
+  model_->AdjustTextForCopy(selection.selection_min(), IsSelectAll(), &text,
+                            &url, &write_url);
+  if (write_url) {
+    selected_text_ = UTF16ToUTF8(text);
+    GtkTargetList* copy_targets =
+        gtk_text_buffer_get_copy_target_list(text_buffer_);
+    gtk_target_list_add_uri_targets(copy_targets, ui::TEXT_URI_LIST);
+  }
   dragged_text_ = selected_text_;
 }
 
 void OmniboxViewGtk::HandleDragEnd(GtkWidget* widget,
                                        GdkDragContext* context) {
+  GdkAtom text_uri_atom = ui::GetAtomForTarget(ui::TEXT_URI_LIST);
+  GtkTargetList* copy_targets =
+      gtk_text_buffer_get_copy_target_list(text_buffer_);
+  gtk_target_list_remove(copy_targets, text_uri_atom);
   dragged_text_.clear();
 }
 
 void OmniboxViewGtk::HandleInsertText(GtkTextBuffer* buffer,
                                       GtkTextIter* location,
                                       const gchar* text,
                                       gint len) {
   std::string filtered_text;
   filtered_text.reserve(len);
 
@@ skipping 718 matching lines @@
   // baseline, so we need to move the |instant_view_| down to make sure it
   // has the same baseline as the |text_view_|.
   PangoLayout* layout = gtk_label_get_layout(GTK_LABEL(instant_view_));
   int height;
   pango_layout_get_size(layout, NULL, &height);
   PangoLayoutIter* iter = pango_layout_get_iter(layout);
   int baseline = pango_layout_iter_get_baseline(iter);
   pango_layout_iter_free(iter);
   g_object_set(instant_anchor_tag_, "rise", baseline - height, NULL);
 }