| Index: ash/shelf/shelf_tooltip_manager.cc
|
| diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc
|
| index 7a9b70da02ab697d8163fbd9932c444beefe69f1..e5f521a270d274d8311b6299e489c0cc52abd63f 100644
|
| --- a/ash/shelf/shelf_tooltip_manager.cc
|
| +++ b/ash/shelf/shelf_tooltip_manager.cc
|
| @@ -138,7 +138,8 @@ void ShelfTooltipManager::ShowTooltip(views::View* view) {
|
| if (bubble_) {
|
| // Cancel the hiding animation to hide the old bubble immediately.
|
| gfx::NativeView native_view = bubble_->GetWidget()->GetNativeView();
|
| - wm::SetWindowVisibilityAnimationTransition(native_view, wm::ANIMATE_NONE);
|
| + ::wm::SetWindowVisibilityAnimationTransition(native_view,
|
| + ::wm::ANIMATE_NONE);
|
| Close();
|
| }
|
|
|
| @@ -153,9 +154,9 @@ void ShelfTooltipManager::ShowTooltip(views::View* view) {
|
| base::string16 text = shelf_view_->GetTitleForView(view);
|
| bubble_ = new ShelfTooltipBubble(view, arrow, text);
|
| gfx::NativeView native_view = bubble_->GetWidget()->GetNativeView();
|
| - wm::SetWindowVisibilityAnimationType(
|
| - native_view, wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
|
| - wm::SetWindowVisibilityAnimationTransition(native_view, wm::ANIMATE_HIDE);
|
| + ::wm::SetWindowVisibilityAnimationType(
|
| + native_view, ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
|
| + ::wm::SetWindowVisibilityAnimationTransition(native_view, ::wm::ANIMATE_HIDE);
|
| bubble_->GetWidget()->Show();
|
| }
|
|
|
|
|