ash: Fix crash in launcher tooltip manager

ash/launcher/launcher_view.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 "ash/launcher/launcher_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 459 matching lines @@
               views::ImageButton::ALIGN_CENTER),
           shelf->SelectValueForShelfAlignment(
               views::ImageButton::ALIGN_TOP,
               views::ImageButton::ALIGN_MIDDLE,
               views::ImageButton::ALIGN_MIDDLE,
               views::ImageButton::ALIGN_BOTTOM));
     }
     if (i >= first_visible_index_ && i <= last_visible_index_)
       view_model_->view_at(i)->Layout();
   }
-  tooltip_->UpdateArrow();
+  tooltip_->Close();

[James Cook, 2013/09/13 23:54:09]

The fix below to close the tooltip when its launcher button is removed is
probably sufficient to fix the crash (it fixes the test I added to repro the
crash). However, it doesn't really make sense to keep tooltips open during shelf
alignment changes, so I just close them.

   if (overflow_bubble_)
     overflow_bubble_->Hide();
 }
 
 void LauncherView::SchedulePaintForAllButtons() {
   for (int i = 0; i < view_model_->view_size(); ++i) {
     if (i >= first_visible_index_ && i <= last_visible_index_)
       view_model_->view_at(i)->SchedulePaint();
   }
   if (overflow_button_ && overflow_button_->visible())
@@ skipping 954 matching lines @@
   // above animation finishes, CalculateIdealBounds will be called to get
   // correct overflow range. CalculateIdealBounds could hide overflow bubble
   // and triggers LauncherItemChanged. And since we are still in the middle
   // of LauncherItemRemoved, LauncherView in overflow bubble is not synced
   // with LauncherModel and will crash.
   if (overflow_bubble_ && overflow_bubble_->IsShowing()) {
     last_hidden_index_ = std::min(last_hidden_index_,
                                   view_model_->view_size() - 1);
     UpdateOverflowRange(overflow_bubble_->launcher_view());
   }
+
+  // Close the tooltip because it isn't needed any longer and its anchor view
+  // will be deleted soon.
+  if (tooltip_->anchor() == view)
+    tooltip_->Close();
 }
 
 void LauncherView::LauncherItemChanged(int model_index,
                                        const ash::LauncherItem& old_item) {
   const LauncherItem& item(model_->items()[model_index]);
   if (old_item.type != item.type) {
     // Type changed, swap the views.
     model_index = CancelDrag(model_index);
     scoped_ptr<views::View> old_view(view_model_->view_at(model_index));
     bounds_animator_->StopAnimatingView(old_view.get());
@@ skipping 424 matching lines @@
       break;
     case ash::SHELF_ALIGNMENT_TOP:
       distance = coordinate.y() - bounds.bottom();
       break;
   }
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace internal
 }  // namespace ash