| Index: ash/system/tray/tray_background_view.cc
|
| diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
|
| index e0f2fec679aa372da34eae374f7c4a7e66dad5d0..7c6fe5582588a20f6372995846e34f53e7021acc 100644
|
| --- a/ash/system/tray/tray_background_view.cc
|
| +++ b/ash/system/tray/tray_background_view.cc
|
| @@ -459,13 +459,12 @@ void TrayBackgroundView::HideTransformation() {
|
|
|
| void TrayBackgroundView::InitializeBubbleAnimations(
|
| views::Widget* bubble_widget) {
|
| - wm::SetWindowVisibilityAnimationType(
|
| + ::wm::SetWindowVisibilityAnimationType(
|
| bubble_widget->GetNativeWindow(),
|
| - wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| - wm::SetWindowVisibilityAnimationTransition(
|
| - bubble_widget->GetNativeWindow(),
|
| - wm::ANIMATE_HIDE);
|
| - wm::SetWindowVisibilityAnimationDuration(
|
| + ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
|
| + ::wm::SetWindowVisibilityAnimationTransition(bubble_widget->GetNativeWindow(),
|
| + ::wm::ANIMATE_HIDE);
|
| + ::wm::SetWindowVisibilityAnimationDuration(
|
| bubble_widget->GetNativeWindow(),
|
| base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMs));
|
| }
|
|
|