| Index: ash/wm/workspace_controller.cc
|
| diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
|
| index 99c12cd20aee455b78c41863975b3dd62a1f2212..32c662ad45e973c1fabca0ed8285a76a405d6ec1 100644
|
| --- a/ash/wm/workspace_controller.cc
|
| +++ b/ash/wm/workspace_controller.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "ash/aura/wm_window_aura.h"
|
| #include "ash/common/shell_window_ids.h"
|
| +#include "ash/common/wm/window_animation_types.h"
|
| #include "ash/common/wm/window_state.h"
|
| #include "ash/common/wm/workspace/workspace_layout_manager.h"
|
| #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
|
| @@ -136,7 +137,7 @@ void WorkspaceController::DoInitialAnimation() {
|
| ui::LayerAnimationElement::VISIBILITY);
|
| settings.SetTweenType(gfx::Tween::EASE_OUT);
|
| settings.SetTransitionDuration(
|
| - base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS));
|
| + base::TimeDelta::FromMilliseconds(wm::kCrossFadeDurationMS));
|
| viewport_->layer()->SetTransform(gfx::Transform());
|
| viewport_->layer()->SetOpacity(1.0f);
|
| }
|
|
|