Merge 147513 - Change variable name to avoid scoping issues.

chrome/browser/ui/gtk/tabs/tab_gtk.cc

 // Copyright (c) 2012 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/tabs/tab_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 308 matching lines @@
 }
 
 void TabGtk::DestroyDragWidget() {
   if (drag_widget_) {
     gtk_widget_destroy(drag_widget_);
     drag_widget_ = NULL;
   }
 }
 
 void TabGtk::StartDragging(gfx::Point drag_offset) {
+  // If the drag is processed after the selection change it's possible
+  // that the tab has been deselected, in which case we don't want to drag.
+  if (!IsSelected())
+    return;
+
   CreateDragWidget();
 
   GtkTargetList* list = ui::GetTargetListFromCodeMask(ui::CHROME_TAB);
   gtk_drag_begin(drag_widget_, list, GDK_ACTION_MOVE,
                  1,  // Drags are always initiated by the left button.
                  last_mouse_down_);
   // gtk_drag_begin adds a reference to list, so unref it here.
   gtk_target_list_unref(list);
   delegate_->MaybeStartDrag(this, drag_offset);
 }
@@ skipping 14 matching lines @@
     gdk_event_free(last_mouse_down_);
     last_mouse_down_ = NULL;
   }
 
   // Notify the drag helper that we're done with any potential drag operations.
   // Clean up the drag helper, which is re-created on the next mouse press.
   delegate_->EndDrag(canceled);
 
   observer_.reset();
 }