Correctly update drag status for drags over renderer. This makes things look ...

chrome/browser/gtk/bookmark_manager_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/bookmark_manager_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 36 matching lines @@
 
 // Time between a user action in the search box and when we perform the search.
 const int kSearchDelayMS = 200;
 
 // The default width of a column in the right tree view. Since we set the
 // columns to ellipsize, if we don't explicitly set a width they will be
 // wide enough to display only '...'. This will be overridden if the user
 // resizes the column.
 const int kDefaultColumnWidth = 200;
 
+const int kDestTargetList[] = { GtkDndUtil::CHROME_BOOKMARK_ITEM, 0 };

[tony, 2009/07/27 23:33:03]

Nit: Comment?

+
 // We only have one manager open at a time.
 BookmarkManagerGtk* manager = NULL;
 
 // Observer installed on the importer. When done importing the newly created
 // folder is selected in the bookmark manager.
 // This class is taken almost directly from BookmarkManagerView and should be
 // kept in sync with it.
 class ImportObserverImpl : public ImportObserver {
  public:
   explicit ImportObserverImpl(Profile* profile) : profile_(profile) {
@@ skipping 375 matching lines @@
   g_signal_connect(left_tree_view_, "button-press-event",
                    G_CALLBACK(OnTreeViewButtonPress), this);
   g_signal_connect(left_tree_view_, "button-release-event",
                    G_CALLBACK(OnTreeViewButtonRelease), this);
   g_signal_connect(left_tree_view_, "key-press-event",
                    G_CALLBACK(OnTreeViewKeyPress), this);
 
   // The left side is only a drag destination (not a source).
   gtk_drag_dest_set(left_tree_view_, GTK_DEST_DEFAULT_DROP,
                     NULL, 0, GDK_ACTION_MOVE);
-  GtkDndUtil::SetDestTargetListFromCodeMask(left_tree_view_,
-                                            GtkDndUtil::CHROME_BOOKMARK_ITEM);
+  GtkDndUtil::SetDestTargetList(left_tree_view_, kDestTargetList);
 
   g_signal_connect(left_tree_view_, "drag-data-received",
                    G_CALLBACK(&OnLeftTreeViewDragReceived), this);
   g_signal_connect(left_tree_view_, "drag-motion",
                    G_CALLBACK(&OnLeftTreeViewDragMotion), this);
 
   GtkWidget* scrolled = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
@@ skipping 54 matching lines @@
                    G_CALLBACK(OnTreeViewButtonRelease), this);
   g_signal_connect(right_tree_view_, "key-press-event",
                    G_CALLBACK(OnTreeViewKeyPress), this);
 
   // We don't advertise GDK_ACTION_COPY, but since we don't explicitly do
   // any deleting following a succesful move, this should work.
   gtk_drag_source_set(right_tree_view_,
                       GDK_BUTTON1_MASK,
                       NULL, 0, GDK_ACTION_MOVE);
   GtkDndUtil::SetSourceTargetListFromCodeMask(
-      right_tree_view_, GtkDndUtil::CHROME_BOOKMARK_ITEM |
-                        GtkDndUtil::TEXT_URI_LIST);
+      right_tree_view_, kDestTargetList);
 
   // We connect to drag dest signals, but we don't actually enable the widget
   // as a drag destination unless it corresponds to the contents of a folder.
   // See BuildRightStore().
   g_signal_connect(right_tree_view_, "drag-data-get",
                    G_CALLBACK(&OnRightTreeViewDragGet), this);
   g_signal_connect(right_tree_view_, "drag-data-received",
                    G_CALLBACK(&OnRightTreeViewDragReceived), this);
   g_signal_connect(right_tree_view_, "drag-motion",
                    G_CALLBACK(&OnRightTreeViewDragMotion), this);
@@ skipping 71 matching lines @@
   if (node) {
     SaveColumnConfiguration();
     gtk_tree_view_column_set_visible(path_column_, FALSE);
     SizeColumns();
 
     right_tree_model_.reset(
         BookmarkTableModel::CreateBookmarkTableModelForFolder(model_, node));
 
     gtk_drag_dest_set(right_tree_view_, GTK_DEST_DEFAULT_ALL, NULL, 0,
                       GDK_ACTION_MOVE);
-    GtkDndUtil::SetDestTargetListFromCodeMask(right_tree_view_,
-                                              GtkDndUtil::CHROME_BOOKMARK_ITEM);
+    GtkDndUtil::SetDestTargetList(right_tree_view_, kDestTargetList);
   } else {
     SaveColumnConfiguration();
     gtk_tree_view_column_set_visible(path_column_, TRUE);
     SizeColumns();
 
     int id = GetSelectedRowID();
     if (kRecentID == id) {
       right_tree_model_.reset(
           BookmarkTableModel::CreateRecentlyBookmarkedModel(model_));
     } else {  // kSearchID == id
@@ skipping 653 matching lines @@
   } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) {
     if (g_browser_process->io_thread()) {
       bookmark_html_writer::WriteBookmarks(
           g_browser_process->io_thread()->message_loop(), model_,
           path.ToWStringHack());
     }
   } else {
     NOTREACHED();
   }
 }