Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(397)

Unified Diff: ash/wm/overview/window_selector_window.cc

Issue 231643002: Added labels under the windows in OverviewMode displaying their current name. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests, code polishing Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 52b6be85fb1bd2a54df00dbb9404fd98d9f7915c..c3500aef8212443e0081fb98cef4ede24ec03f7d 100644
--- a/ash/wm/overview/window_selector_window.cc
+++ b/ash/wm/overview/window_selector_window.cc
@@ -47,10 +47,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)
@@ -82,6 +78,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();
@@ -104,10 +104,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(root_window);
}
@@ -154,7 +157,7 @@ void WindowSelectorWindow::UpdateCloseButtonBounds(aura::Window* root_window) {
settings.SetPreemptionStrategy(
ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
- kCloseButtonFadeInMilliseconds));
+ WindowSelectorItem::kFadeInMilliseconds));
layer->SetOpacity(1);
}
} else {

Powered by Google App Engine
This is Rietveld 408576698