| Index: ash/wm/overview/window_selector_window.cc
|
| diff --git a/ash/wm/overview/window_selector_window.cc b/ash/wm/overview/window_selector_window.cc
|
| index 942edf41efddcbb4e92a1f439d7e138dd449acaa..3b8057541cac8dd90d9189d0e7a6834ad9bf3875 100644
|
| --- a/ash/wm/overview/window_selector_window.cc
|
| +++ b/ash/wm/overview/window_selector_window.cc
|
| @@ -46,10 +46,6 @@ views::Widget* CreateCloseWindowButton(aura::Window* root_window,
|
| return widget;
|
| }
|
|
|
| -// The time for the close button to fade in when initially shown on entering
|
| -// overview mode.
|
| -const int kCloseButtonFadeInMilliseconds = 80;
|
| -
|
| } // namespace
|
|
|
| WindowSelectorWindow::WindowSelectorWindow(aura::Window* window)
|
| @@ -77,7 +73,7 @@ void WindowSelectorWindow::RestoreWindowOnExit(aura::Window* window) {
|
| transform_window_.RestoreWindowOnExit();
|
| }
|
|
|
| -aura::Window* WindowSelectorWindow::SelectionWindow() {
|
| +aura::Window* WindowSelectorWindow::SelectionWindow() const {
|
| return transform_window_.window();
|
| }
|
|
|
| @@ -103,10 +99,13 @@ void WindowSelectorWindow::SetItemBounds(aura::Window* root_window,
|
| bool animate) {
|
| gfx::Rect src_rect = transform_window_.GetBoundsInScreen();
|
| set_bounds(ScopedTransformOverviewWindow::
|
| - ShrinkRectToFitPreservingAspectRatio(src_rect, target_bounds));
|
| + ShrinkRectToFitPreservingAspectRatio(src_rect, target_bounds));
|
| transform_window_.SetTransform(root_window,
|
| ScopedTransformOverviewWindow::GetTransformForRect(src_rect, bounds()),
|
| animate);
|
| + // TODO move close button management to WindowSelectorItem, so that we can
|
| + // also handle panels.
|
| + // See http://crbug.com/352143
|
| UpdateCloseButtonBounds();
|
| }
|
|
|
| @@ -153,7 +152,7 @@ void WindowSelectorWindow::UpdateCloseButtonBounds() {
|
| settings.SetPreemptionStrategy(
|
| ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
|
| settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
|
| - kCloseButtonFadeInMilliseconds));
|
| + ScopedTransformOverviewWindow::kFadeInMilliseconds));
|
| layer->SetOpacity(1);
|
| }
|
| } else {
|
|
|