Change variable name to avoid scoping issues.

chrome/browser/ui/gtk/tabs/tab_strip_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_strip_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 1261 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void TabStripGtk::MaybeStartDrag(TabGtk* tab, const gfx::Point& point) {
   // Don't accidentally start any drag operations during animations if the
   // mouse is down.
   if (IsAnimating() || tab->closing() || !HasAvailableDragActions())
     return;
 
   std::vector<TabGtk*> tabs;
+  TabGtk* selected_tab;

[sky, 2012/07/18 04:09:11]

selected_tab is only needed in the loop, move it there.

[Cris Neckar, 2012/07/18 19:35:14]

Done.

   for (size_t i = 0; i < model()->selection_model().size(); i++) {
-    TabGtk* tab = GetTabAt(model()->selection_model().selected_indices()[i]);
-    if (!tab->closing())
-      tabs.push_back(tab);
+    selected_tab = GetTabAt(model()->selection_model().selected_indices()[i]);
+    if (!selected_tab->closing())
+      tabs.push_back(selected_tab);
   }
+  // If the tab is closing it will not have been added to the vector.
+  if (selected_tab->closing())

[sky, 2012/07/18 04:09:11]

This should be remove (it's handled by 1278.

[Cris Neckar, 2012/07/18 19:35:14]

Done.

+    return;
 
-  drag_controller_.reset(new DraggedTabControllerGtk(this, tab, tabs));
+  drag_controller_.reset(new DraggedTabControllerGtk(this, selected_tab, tabs));

[sky, 2012/07/18 04:09:11]

This should use tab.

[Cris Neckar, 2012/07/18 19:35:14]

Done.

   drag_controller_->CaptureDragInfo(point);
 }
 
 void TabStripGtk::ContinueDrag(GdkDragContext* context) {
   // We can get called even if |MaybeStartDrag| wasn't called in the event of
   // a TabStrip animation when the mouse button is down. In this case we should
   // _not_ continue the drag because it can lead to weird bugs.
   if (drag_controller_.get())
     drag_controller_->Drag();
 }
@@ skipping 966 matching lines @@
 }
 
 void TabStripGtk::SetNewTabButtonBackground() {
   SkColor color = theme_service_->GetColor(
       ThemeService::COLOR_BUTTON_BACKGROUND);
   SkBitmap* background = theme_service_->GetBitmapNamed(
       IDR_THEME_WINDOW_CONTROL_BACKGROUND);
   SkBitmap* mask = theme_service_->GetBitmapNamed(IDR_NEWTAB_BUTTON_MASK);
   newtab_button_->SetBackground(color, background, mask);
 }