| Index: ash/wm/workspace/desktop_background_fade_controller.cc
|
| diff --git a/ash/wm/workspace/desktop_background_fade_controller.cc b/ash/wm/workspace/desktop_background_fade_controller.cc
|
| index 563d07bfe36c9a26e9427e38a733100028ef4e37..abbdf578c8f6ff1c0f9e8728567a8b4707caf166 100644
|
| --- a/ash/wm/workspace/desktop_background_fade_controller.cc
|
| +++ b/ash/wm/workspace/desktop_background_fade_controller.cc
|
| @@ -20,15 +20,15 @@ DesktopBackgroundFadeController::DesktopBackgroundFadeController(
|
| base::TimeDelta duration,
|
| Direction direction) {
|
| SkColor start_color, target_color;
|
| - ui::Tween::Type tween_type;
|
| + gfx::Tween::Type tween_type;
|
| if (direction == FADE_OUT) {
|
| start_color = SkColorSetARGB(0, 0, 0, 0);
|
| target_color = SK_ColorBLACK;
|
| - tween_type = ui::Tween::EASE_IN_OUT;
|
| + tween_type = gfx::Tween::EASE_IN_OUT;
|
| } else {
|
| start_color = SK_ColorBLACK;
|
| target_color = SkColorSetARGB(0, 0, 0, 0);
|
| - tween_type = ui::Tween::EASE_IN_OUT;
|
| + tween_type = gfx::Tween::EASE_IN_OUT;
|
| }
|
|
|
| window_controller_.reset(
|
|
|