Fix a few issues with the drop arrow in the Linux tab strip:...

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"
@@ skipping 476 matching lines @@
   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",
                    G_CALLBACK(OnDragLeave), this);
-  g_signal_connect(G_OBJECT(tabstrip_.get()), "drag-failed",
-                   G_CALLBACK(OnDragFailed), this);
   g_signal_connect(G_OBJECT(tabstrip_.get()), "drag-data-received",
                    G_CALLBACK(OnDragDataReceived), this);
 
   newtab_button_.reset(MakeNewTabButton());
 
 #if defined(OS_CHROMEOS)
   tab_overview_button_.reset(MakeTabOverviewButton());
 #endif
 
   gtk_widget_show_all(tabstrip_.get());
@@ skipping 708 matching lines @@
       drop_info_->drop_arrow= GetDropArrowImage(drop_info_->point_down);
     }
   }
 
   gtk_window_move(GTK_WINDOW(drop_info_->container),
                   drop_bounds.x(), drop_bounds.y());
   gtk_window_resize(GTK_WINDOW(drop_info_->container),
                     drop_bounds.width(), drop_bounds.height());
 }
 
-void TabStripGtk::CompleteDrop(guchar* data) {
+bool TabStripGtk::CompleteDrop(guchar* data) {
   if (!drop_info_.get())
-    return;
+    return false;
 
   const int drop_index = drop_info_->drop_index;
   const bool drop_before = drop_info_->drop_before;
 
-  // Hide the drop indicator.
-  SetDropIndex(-1, false);
+  // Destroy the drop indicator.
+  drop_info_.reset();
 
   GURL url(reinterpret_cast<char*>(data));
   if (!url.is_valid())
-    return;
+    return false;
 
   if (drop_before) {
     // Insert a new tab.
     TabContents* contents =
         model_->delegate()->CreateTabContentsForURL(
             url, GURL(), model_->profile(), PageTransition::TYPED, false,
             NULL);
     model_->AddTabContents(contents, drop_index, false,
                            PageTransition::GENERATED, true);
   } else {
     model_->GetTabContentsAt(drop_index)->controller().LoadURL(
         url, GURL(), PageTransition::GENERATED);
     model_->SelectTabContentsAt(drop_index, true);
   }
+
+  return true;
 }
 
 // static
 GdkPixbuf* TabStripGtk::GetDropArrowImage(bool is_down) {
   return ResourceBundle::GetSharedInstance().GetPixbufNamed(
       is_down ? IDR_TAB_DROP_DOWN : IDR_TAB_DROP_UP);
 }
 
 // TabStripGtk::DropInfo -------------------------------------------------------
 
 TabStripGtk::DropInfo::DropInfo(int drop_index, bool drop_before,
                                 bool point_down)
     : drop_index(drop_index),
       drop_before(drop_before),
       point_down(point_down) {
   container = gtk_window_new(GTK_WINDOW_POPUP);
   SetContainerColorMap();
   gtk_widget_set_app_paintable(container, TRUE);
   g_signal_connect(G_OBJECT(container), "expose-event",
                    G_CALLBACK(OnExposeEvent), this);
   gtk_widget_add_events(container, GDK_STRUCTURE_MASK);
+  gtk_window_move(GTK_WINDOW(container), 0, 0);
+  gtk_window_resize(GTK_WINDOW(container),
+                    drop_indicator_width, drop_indicator_height);
   gtk_widget_show_all(container);
 
   drop_arrow = GetDropArrowImage(point_down);
-
-  gtk_window_move(GTK_WINDOW(container), 0, 0);
-  gtk_window_resize(GTK_WINDOW(container),
-                    drop_indicator_width, drop_indicator_height);
 }
 
 TabStripGtk::DropInfo::~DropInfo() {
   gtk_widget_destroy(container);
 }
 
 // static
 gboolean TabStripGtk::DropInfo::OnExposeEvent(GtkWidget* widget,
                                               GdkEventExpose* event,
                                               DropInfo* drop_info) {
@@ skipping 251 matching lines @@
     gtk_drag_finish(context, FALSE, FALSE, time);
   else
     gtk_drag_get_data(widget, context, target, time);
 
   return TRUE;
 }
 
 // static
 gboolean TabStripGtk::OnDragLeave(GtkWidget* widget, GdkDragContext* context,
                                   guint time, TabStripGtk* tabstrip) {
-  // Hide the drop indicator.
-  tabstrip->SetDropIndex(-1, false);
-  return FALSE;
-}
-
-// static
-gboolean TabStripGtk::OnDragFailed(GtkWidget* widget, GdkDragContext* context,
-                                   GtkDragResult result,
-                                   TabStripGtk* tabstrip) {
-  // Hide the drop indicator.
-  tabstrip->SetDropIndex(-1, false);
+  // Destroy the drop indicator.
+  tabstrip->drop_info_.reset();
   return FALSE;
 }
 
 // static
 gboolean TabStripGtk::OnDragDataReceived(GtkWidget* widget,
                                          GdkDragContext* context,
                                          gint x, gint y,
                                          GtkSelectionData* data,
                                          guint info, guint time,
                                          TabStripGtk* tabstrip) {
+  bool success = false;
+
   // TODO(jhawkins): Parse URI lists.
   if (info == GtkDndUtil::X_CHROME_TEXT_PLAIN) {
-    tabstrip->CompleteDrop(data->data);
-    gtk_drag_finish(context, TRUE, TRUE, time);
+    success = tabstrip->CompleteDrop(data->data);
   }
 
+  gtk_drag_finish(context, success, success, time);
   return TRUE;
 }
 
 // static
 void TabStripGtk::OnNewTabClicked(GtkWidget* widget, TabStripGtk* tabstrip) {
   tabstrip->model_->delegate()->AddBlankTab(true);
 }
 
 void TabStripGtk::SetTabBounds(TabGtk* tab, const gfx::Rect& bounds) {
   gfx::Rect bds = bounds;
@@ skipping 38 matching lines @@
   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);
 
   UserMetrics::RecordAction(L"TabOverview_PressedTabOverviewButton",
                             tabstrip->model_->profile());
 }
 #endif