| Index: ash/wm/window_animations.cc
|
| diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
|
| index ae7188a323f1b1a58a8a2b44cee44cc815e2d99f..aad40c98e6622f7a2c3a07c1a066deabb70a4ae2 100644
|
| --- a/ash/wm/window_animations.cc
|
| +++ b/ash/wm/window_animations.cc
|
| @@ -9,7 +9,7 @@
|
| #include <algorithm>
|
| #include <vector>
|
|
|
| -#include "ash/screen_ash.h"
|
| +#include "ash/screen_util.h"
|
| #include "ash/shelf/shelf.h"
|
| #include "ash/shelf/shelf_layout_manager.h"
|
| #include "ash/shelf/shelf_widget.h"
|
| @@ -77,7 +77,7 @@ void AddLayerAnimationsForMinimize(aura::Window* window, bool show) {
|
| gfx::Rect bounds = window->bounds();
|
| gfx::Rect target_bounds = GetMinimizeAnimationTargetBoundsInScreen(window);
|
| target_bounds =
|
| - ScreenAsh::ConvertRectFromScreen(window->parent(), target_bounds);
|
| + ScreenUtil::ConvertRectFromScreen(window->parent(), target_bounds);
|
|
|
| float scale_x = static_cast<float>(target_bounds.width()) / bounds.width();
|
| float scale_y = static_cast<float>(target_bounds.height()) / bounds.height();
|
|
|