Added labels under the windows in OverviewMode displaying their current name.

ash/wm/overview/window_selector_window.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/overview/window_selector_window.h"
 
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/overview/scoped_transform_overview_window.h"
@@ skipping 29 matching lines @@
   button->SetImage(views::CustomButton::STATE_HOVERED,
       rb.GetImageSkiaNamed(IDR_AURA_WINDOW_OVERVIEW_CLOSE_H));
   button->SetImage(views::CustomButton::STATE_PRESSED,
       rb.GetImageSkiaNamed(IDR_AURA_WINDOW_OVERVIEW_CLOSE_P));
   widget->SetContentsView(button);
   widget->SetSize(rb.GetImageSkiaNamed(IDR_AURA_WINDOW_OVERVIEW_CLOSE)->size());
   widget->Show();
   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)
     : transform_window_(window) {
 }
 
 WindowSelectorWindow::~WindowSelectorWindow() {
 }
 
 aura::Window* WindowSelectorWindow::GetRootWindow() {
@@ skipping 11 matching lines @@
 }
 
 void WindowSelectorWindow::RestoreWindowOnExit(aura::Window* window) {
   transform_window_.RestoreWindowOnExit();
 }
 
 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();
   // Remove the close button now so that the exited mouse event which is
   // delivered to the destroyed button as it is destroyed does not happen while
   // this item is being removed from the list of windows in overview.
   close_button_.reset();
 }
 
 bool WindowSelectorWindow::empty() const {
   return transform_window_.window() == NULL;
 }
 
 void WindowSelectorWindow::PrepareForOverview() {
   transform_window_.PrepareForOverview();
 }
 
 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));
+        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);
 }
 
 void WindowSelectorWindow::ButtonPressed(views::Button* sender,
                          const ui::Event& event) {
   views::Widget::GetTopLevelWidgetForNativeView(
       transform_window_.window())->Close();
 }
 
 void WindowSelectorWindow::UpdateCloseButtonBounds(aura::Window* root_window) {
@@ skipping 26 matching lines @@
     layer->GetAnimator()->StopAnimating();
     layer->GetAnimator()->SchedulePauseForProperties(
         base::TimeDelta::FromMilliseconds(
             ScopedTransformOverviewWindow::kTransitionMilliseconds),
         ui::LayerAnimationElement::OPACITY);
     {
       ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
       settings.SetPreemptionStrategy(
           ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
       settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
-            kCloseButtonFadeInMilliseconds));
+            WindowSelectorItem::kFadeInMilliseconds));
       layer->SetOpacity(1);
     }
   } else {
     ui::ScopedLayerAnimationSettings settings(
         close_button_->GetNativeWindow()->layer()->GetAnimator());
     settings.SetPreemptionStrategy(
         ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     settings.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         ScopedTransformOverviewWindow::kTransitionMilliseconds));
     close_button_->GetNativeWindow()->SetTransform(close_button_transform);
   }
 }
 
 }  // namespace ash