| Index: ash/wm/window_animations.cc
|
| diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
|
| index 58417ecee3034104f30e4ba977c26ff2f4255229..6822175846e45907df87612ff670d189df5bd3e1 100644
|
| --- a/ash/wm/window_animations.cc
|
| +++ b/ash/wm/window_animations.cc
|
| @@ -13,6 +13,7 @@
|
| #include "ash/shelf/shelf.h"
|
| #include "ash/shelf/shelf_layout_manager.h"
|
| #include "ash/shelf/shelf_widget.h"
|
| +#include "ash/wm/common/window_animation_types.h"
|
| #include "ash/wm/window_util.h"
|
| #include "ash/wm/workspace_controller.h"
|
| #include "base/command_line.h"
|
| @@ -227,10 +228,10 @@ bool AnimateShowWindow(aura::Window* window) {
|
| }
|
|
|
| switch (::wm::GetWindowVisibilityAnimationType(window)) {
|
| - case WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE:
|
| + case wm::WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE:
|
| AnimateShowWindow_Minimize(window);
|
| return true;
|
| - case WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE:
|
| + case wm::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE:
|
| AnimateShowWindow_BrightnessGrayscale(window);
|
| return true;
|
| default:
|
| @@ -246,10 +247,10 @@ bool AnimateHideWindow(aura::Window* window) {
|
| }
|
|
|
| switch (::wm::GetWindowVisibilityAnimationType(window)) {
|
| - case WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE:
|
| + case wm::WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE:
|
| AnimateHideWindow_Minimize(window);
|
| return true;
|
| - case WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE:
|
| + case wm::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE:
|
| AnimateHideWindow_BrightnessGrayscale(window);
|
| return true;
|
| default:
|
|
|