summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 20:56:04 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-20 20:56:04 +0000
commit798dce5e549ff3a9f71f6903eb65f773782310d5 (patch)
tree131c8e324fa9c5e71f35ebdd8d7edd1ebe741bc3
parent916af20d45a450b4c5c4ed0cc9865cdc05d5a65c (diff)
downloadchromium_src-798dce5e549ff3a9f71f6903eb65f773782310d5.zip
chromium_src-798dce5e549ff3a9f71f6903eb65f773782310d5.tar.gz
chromium_src-798dce5e549ff3a9f71f6903eb65f773782310d5.tar.bz2
Revert part of r82614 which regressed dropping stuff onto the tabstrip
BUG=82783 TEST=dragging a link onto the tabstrip and dropping it works (ie. loads that link in a new or current tab) Review URL: http://codereview.chromium.org/7049014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86144 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index 32b1b27..dc81430 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -1983,7 +1983,7 @@ gboolean TabStripGtk::OnDragDrop(GtkWidget* widget, GdkDragContext* context,
gboolean TabStripGtk::OnDragLeave(GtkWidget* widget, GdkDragContext* context,
guint time) {
// Destroy the drop indicator.
- drop_info_.reset();
+ drop_info_->DestroyContainer();
// Cancel any pending tab transition.
hover_tab_selector_.CancelTabTransition();