[ash-md] Reduces dimensions of texture layers in overview mode

ash/common/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_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
 #define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/wm/overview/scoped_transform_overview_window.h"
 #include "ash/common/wm_window_observer.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/image_button.h"
-#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 namespace gfx {
 class SlideAnimation;
 }
 
 namespace views {
 class ImageButton;
 }
 
 namespace wm {
 class Shadow;
 }
 
 namespace ash {
 
 class WindowSelector;
 class WmWindow;
 
 // This class represents an item in overview mode.
 class ASH_EXPORT WindowSelectorItem : public views::ButtonListener,
                                       public WmWindowObserver {
  public:
-  class OverviewLabelButton : public views::LabelButton {
-   public:
-    OverviewLabelButton(views::ButtonListener* listener,
-                        const base::string16& text);
-
-    ~OverviewLabelButton() override;
-
-    // Makes sure that text is readable with |background_color|.
-    void SetBackgroundColorHint(SkColor background_color);
-
-    // Resets the listener so that the listener can go out of scope.
-    void ResetListener() { listener_ = nullptr; }
-
-    void set_padding(const gfx::Insets& padding) { padding_ = padding; }
-
-   protected:
-    // views::LabelButton:
-    gfx::Rect GetChildAreaBounds() override;
-
-   private:
-    // Padding on all sides to correctly place the text inside the view.
-    gfx::Insets padding_;
-
-    DISALLOW_COPY_AND_ASSIGN(OverviewLabelButton);
-  };
-
   // An image button with a close window icon.
   class OverviewCloseButton : public views::ImageButton {
    public:
     explicit OverviewCloseButton(views::ButtonListener* listener);
     ~OverviewCloseButton() override;
 
     // Resets the listener so that the listener can go out of scope.
     void ResetListener() { listener_ = nullptr; }
 
    private:
@@ skipping 31 matching lines @@
   // descendants of the window returned by GetWindow()).
   gfx::Rect GetTargetBoundsInScreen() const;
 
   // Sets the bounds of this window selector item to |target_bounds| in the
   // |root_window_| root window. The bounds change will be animated as specified
   // by |animation_type|.
   void SetBounds(const gfx::Rect& target_bounds,
                  OverviewAnimationType animation_type);
 
   // Activates or deactivates selection depending on |selected|.
-  // Currently does nothing unless Material Design is enabled. With Material
-  // Design the item's caption is shown transparent in selected state and blends
-  // with the selection widget.
+  // In selected state the item's caption is shown transparent and blends with
+  // the selection widget.
   void SetSelected(bool selected);
 
   // Sends an accessibility event indicating that this window became selected
   // so that it's highlighted and announced if accessibility features are
   // enabled.
   void SendAccessibleSelectionEvent();
 
   // Closes |transform_window_|.
   void CloseWindow();
 
@@ skipping 30 matching lines @@
 
   // Sets the bounds of this selector's items to |target_bounds| in
   // |root_window_|. The bounds change will be animated as specified
   // by |animation_type|.
   void SetItemBounds(const gfx::Rect& target_bounds,
                      OverviewAnimationType animation_type);
 
   // Changes the opacity of all the windows the item owns.
   void SetOpacity(float opacity);
 
-  // Updates the window label bounds.
-  void UpdateWindowLabel(const gfx::Rect& window_bounds,
-                         OverviewAnimationType animation_type);
-
   // Creates the window label.
   void CreateWindowLabel(const base::string16& title);
 
   // Updates the close button's and title label's bounds. Any change in bounds
   // will be animated from the current bounds to the new bounds as per the
   // |animation_type|. |mode| allows distinguishing the first time update which
   // allows setting the initial bounds properly or exiting overview to fade out
   // gradually.
   void UpdateHeaderLayout(HeaderFadeInMode mode,
                           OverviewAnimationType animation_type);
 
   // Animates opacity of the |transform_window_| and its caption to |opacity|
   // using |animation_type|.
   void AnimateOpacity(float opacity, OverviewAnimationType animation_type);
 
-  // Updates the close buttons accessibility name.
-  void UpdateCloseButtonAccessibilityName();
+  // Updates the accessibility name to match the window title.
+  void UpdateAccessibilityName();
 
   // Fades out a window caption when exiting overview mode.
   void FadeOut(std::unique_ptr<views::Widget> widget);
 
   // Allows a test to directly set animation state.
   gfx::SlideAnimation* GetBackgroundViewAnimation();
 
   WmWindow* GetOverviewWindowForMinimizedStateForTest();
 
   // True if the item is being shown in the overview, false if it's being
@@ skipping 11 matching lines @@
 
   // 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_;
 
   // True when |this| item is visually selected. Item header is made transparent
   // when the item is selected.
   bool selected_;
 
-  // Label displaying its name (active tab for tabbed windows).
-  // With Material Design this Widget owns |caption_container_view_| and is
-  // shown above the |transform_window_|.
-  // Otherwise it is shown under the window.
-  std::unique_ptr<views::Widget> window_label_;
+  // A widget that covers the |transform_window_|. The widget has
+  // |caption_container_view_| as its contents view. The widget is backed by a
+  // NOT_DRAWN layer since most of its surface is transparent.
+  std::unique_ptr<views::Widget> item_widget_;
 
   // Shadow around the item in overview.
   std::unique_ptr<::wm::Shadow> shadow_;
 
-  // Container view that owns |window_label_button_view_| and |close_button_|.
-  // Only used with Material Design.
+  // Container view that owns a Button view covering the |transform_window_|.
+  // That button serves as an event shield to receive all events such as clicks
+  // targeting the |transform_window_| or the overview header above the window.
+  // The shield button owns |background_view_| which owns |label_view_|
+  // and |close_button_|.
   CaptionContainerView* caption_container_view_;
 
-  // View for the label below the window or (with material design) above it.
-  OverviewLabelButton* window_label_button_view_;
+  // A View for the text label above the window owned by the |background_view_|.
+  views::Label* label_view_;
 
-  // A close button for the window in this item. Owned by the
-  // |caption_container_view_| with Material Design or by |close_button_widget_|
-  // otherwise.
+  // A close button for the window in this item owned by the |background_view_|.
   OverviewCloseButton* close_button_;
 
   // Pointer to the WindowSelector that owns the WindowGrid containing |this|.
   // Guaranteed to be non-null for the lifetime of |this|.
   WindowSelector* window_selector_;
 
   // Pointer to a view that covers the original header and has rounded top
-  // corners. This view can have its color and opacity animated.
+  // corners. This view can have its color and opacity animated. It has a layer
+  // which is the only textured layer used by the |item_widget_|.
   RoundedContainerView* background_view_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_