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

ash/wm/overview/window_selector_item.h

 // 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.
 
 #ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
 #define ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
 
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/strings/string16.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
 class Window;
 }
 
+namespace views {
+class Widget;
+}
+
 namespace ash {
 
 // This class represents an item in overview mode. An item can have one or more
 // windows, of which only one can be activated by keyboard (i.e. alt+tab) but
 // any can be selected with a pointer (touch or mouse).
 class WindowSelectorItem {
+ friend class WindowSelectorTest;

[flackr, 2014/04/17 03:44:29]

This belongs at the beginning of private: section.

[Nina, 2014/04/17 15:02:19]

Done.

+
  public:
   WindowSelectorItem();
   virtual ~WindowSelectorItem();
 
+  // The time for the close buttons and labels to fade in when initially shown
+  // on entering overview mode.
+  static const int kFadeInMilliseconds;
+
   // Returns the root window on which this item is shown.
   virtual aura::Window* GetRootWindow() = 0;
 
   // Returns true if the window selector item has |window| as a selectable
   // window.
   virtual bool HasSelectableWindow(const aura::Window* window) = 0;
 
   // Returns the targeted window given the event |target| window.
   // Returns NULL if no Window in this item was selected.
   virtual aura::Window* TargetedWindow(const aura::Window* target) = 0;
 
   // Restores |window| on exiting window overview rather than returning it
   // to its previous state.
   virtual void RestoreWindowOnExit(aura::Window* window) = 0;
 
   // Returns the |window| to activate on selecting of this item.
   virtual aura::Window* SelectionWindow() = 0;
+  virtual const aura::Window* SelectionWindow() const = 0;

[flackr, 2014/04/17 03:44:29]

I don't think you need the const version of this anymore since removing the
GetLabelName function..

[Nina, 2014/04/17 15:02:19]

Done.

 
   // Removes |window| from this item. Check empty() after calling this to see
   // if the entire item is now empty.
   virtual void RemoveWindow(const aura::Window* window) = 0;
 
   // Returns true if this item has no more selectable windows (i.e. after
   // calling RemoveWindow for the last contained window).
   virtual bool empty() const = 0;
 
   // Dispatched before beginning window overview. This will do any necessary
@@ skipping 15 matching lines @@
  protected:
   // Sets the bounds of this selector item to |target_bounds| in |root_window|.
   // If |animate| the windows are animated from their current location.
   virtual void SetItemBounds(aura::Window* root_window,
                              const gfx::Rect& target_bounds,
                              bool animate) = 0;
 
   // Sets the bounds used by the selector item's windows.
   void set_bounds(const gfx::Rect& bounds) { bounds_ = bounds; }
 
+  // Creates a label to display under the window selector item.
+  void UpdateWindowLabels(const gfx::Rect& target_bounds,
+                          aura::Window* root_window);
+
  private:
   // The root window this item is being displayed on.
   aura::Window* root_window_;
 
   // The target bounds this selector item is fit within.
   gfx::Rect target_bounds_;
 
   // The actual bounds of the window(s) for this item. The aspect ratio of
   // window(s) are maintained so they may not fill the target_bounds_.
   gfx::Rect bounds_;
 
   // True if running SetItemBounds. This prevents recursive calls resulting from
   // the bounds update when calling ::wm::RecreateWindowLayers to copy
   // a window layer for display on another monitor.
   bool in_bounds_update_;
 
+  // Label under the window displaying its active tab name.
+  scoped_ptr<views::Widget> window_label_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_