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

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 nits, added transparency 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 942edf41efddcbb4e92a1f439d7e138dd449acaa..0af519432b3b8803b3993a11f6035f7549c59256 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)
@@ -59,6 +55,10 @@ WindowSelectorWindow::WindowSelectorWindow(aura::Window* window)
WindowSelectorWindow::~WindowSelectorWindow() {
}
+base::string16 WindowSelectorWindow::GetLabelName() {
+ return transform_window_.window()->title();
+}
+
aura::Window* WindowSelectorWindow::GetRootWindow() {
return transform_window_.window()->GetRootWindow();
}
@@ -102,8 +102,10 @@ void WindowSelectorWindow::SetItemBounds(aura::Window* root_window,
const gfx::Rect& target_bounds,
bool animate) {
gfx::Rect src_rect = transform_window_.GetBoundsInScreen();
- set_bounds(ScopedTransformOverviewWindow::
- ShrinkRectToFitPreservingAspectRatio(src_rect, target_bounds));
+ const gfx::Rect window_bounds =
+ ScopedTransformOverviewWindow::
+ ShrinkRectToFitPreservingAspectRatio(src_rect, target_bounds);
+ set_bounds(window_bounds);
flackr 2014/04/14 20:31:18 This change seems like a noop. Revert to old code
Nina 2014/04/15 15:15:03 Done.
transform_window_.SetTransform(root_window,
ScopedTransformOverviewWindow::GetTransformForRect(src_rect, bounds()),
animate);
@@ -153,7 +155,7 @@ void WindowSelectorWindow::UpdateCloseButtonBounds() {
settings.SetPreemptionStrategy(
ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
- kCloseButtonFadeInMilliseconds));
+ ScopedTransformOverviewWindow::kFadeInMilliseconds));
layer->SetOpacity(1);
}
} else {

Powered by Google App Engine
This is Rietveld 408576698