mash: Fix crash when clicking on the shelf overflow icon

ash/system/tray/tray_background_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/system/tray/tray_background_view.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_util.h"
@@ skipping 246 matching lines @@
   if (GetWidget())
     GetWidget()->RemoveObserver(widget_observer_.get());
   StopObservingImplicitAnimations();
 }
 
 void TrayBackgroundView::Initialize() {
   GetWidget()->AddObserver(widget_observer_.get());
   SetTrayBorder();
 }
 
+// static
+void TrayBackgroundView::InitializeBubbleAnimations(
+    views::Widget* bubble_widget) {
+  ::wm::SetWindowVisibilityAnimationType(
+      bubble_widget->GetNativeWindow(),

[msw, 2016/04/28 23:57:36]

optional nit: cache this

[James Cook, 2016/04/29 16:17:40]

Done.

+      ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
+  ::wm::SetWindowVisibilityAnimationTransition(bubble_widget->GetNativeWindow(),
+                                               ::wm::ANIMATE_HIDE);
+  ::wm::SetWindowVisibilityAnimationDuration(
+      bubble_widget->GetNativeWindow(),
+      base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMs));
+}
+
 void TrayBackgroundView::SetVisible(bool visible) {
   if (visible == layer()->GetTargetVisibility())
     return;
 
   if (visible) {
     // The alignment of the shelf can change while the TrayBackgroundView is
     // hidden. Reset the offscreen transform so that the animation to becoming
     // visible reflects the current layout.
     HideTransformation();
     // SetVisible(false) is defered until the animation for hiding is done.
@@ skipping 174 matching lines @@
 
 void TrayBackgroundView::HideTransformation() {
   gfx::Transform transform;
   if (IsHorizontalAlignment(shelf_alignment_))
     transform.Translate(width(), 0.0f);
   else
     transform.Translate(0.0f, height());
   layer()->SetTransform(transform);
 }
 
-void TrayBackgroundView::InitializeBubbleAnimations(
-    views::Widget* bubble_widget) {
-  ::wm::SetWindowVisibilityAnimationType(
-      bubble_widget->GetNativeWindow(),
-      ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
-  ::wm::SetWindowVisibilityAnimationTransition(bubble_widget->GetNativeWindow(),
-                                               ::wm::ANIMATE_HIDE);
-  ::wm::SetWindowVisibilityAnimationDuration(
-      bubble_widget->GetNativeWindow(),
-      base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMs));
-}
-
 aura::Window* TrayBackgroundView::GetBubbleWindowContainer() const {
   return ash::Shell::GetContainer(
       tray_container()->GetWidget()->GetNativeWindow()->GetRootWindow(),
       ash::kShellWindowId_SettingBubbleContainer);
 }
 
 gfx::Rect TrayBackgroundView::GetBubbleAnchorRect(
     views::Widget* anchor_widget,
     TrayBubbleView::AnchorType anchor_type,
     TrayBubbleView::AnchorAlignment anchor_alignment) const {
@@ skipping 99 matching lines @@
     background_->set_alpha(kTrayBackgroundAlpha);
   SchedulePaint();
 }
 
 void TrayBackgroundView::UpdateBubbleViewArrow(
     views::TrayBubbleView* bubble_view) {
   // Nothing to do here.
 }
 
 }  // namespace ash