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..f907acc88122f9276be542ee2405bb7ef85818f3 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) |
@@ -81,6 +77,10 @@ aura::Window* WindowSelectorWindow::SelectionWindow() { |
return transform_window_.window(); |
} |
+const aura::Window* WindowSelectorWindow::SelectionWindow() const { |
+ return transform_window_.window(); |
+} |
+ |
void WindowSelectorWindow::RemoveWindow(const aura::Window* window) { |
DCHECK_EQ(transform_window_.window(), window); |
transform_window_.OnWindowDestroyed(); |
@@ -103,10 +103,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 +156,7 @@ void WindowSelectorWindow::UpdateCloseButtonBounds() { |
settings.SetPreemptionStrategy( |
ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS); |
settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds( |
- kCloseButtonFadeInMilliseconds)); |
+ WindowSelectorItem::kFadeInMilliseconds)); |
layer->SetOpacity(1); |
} |
} else { |