Revert of [ash-md] Fades overview header in and out

ash/common/wm/overview/window_selector_item.h

Index: ash/common/wm/overview/window_selector_item.h
diff --git a/ash/common/wm/overview/window_selector_item.h b/ash/common/wm/overview/window_selector_item.h
index 510690efa1c8c62e7756749a8c4ddd96f334a985..d3467685e639fd637ca260f2d90830debf0eee42 100644
--- a/ash/common/wm/overview/window_selector_item.h
+++ b/ash/common/wm/overview/window_selector_item.h
@@ -14,7 +14,6 @@
 #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/widget/widget.h"
 
@@ -45,9 +44,6 @@
     // 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:
@@ -61,21 +57,6 @@
     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:
-    gfx::ImageSkia icon_image_;
-
-    DISALLOW_COPY_AND_ASSIGN(OverviewCloseButton);
-  };
-
   WindowSelectorItem(WmWindow* window, WindowSelector* window_selector);
   ~WindowSelectorItem() override;
 
@@ -87,11 +68,8 @@
   // Returns true if |target| is contained in this WindowSelectorItem.
   bool Contains(const WmWindow* target) const;
 
-  // Restores and animates the managed window to its non overview mode state.
+  // Restores and animates the managed window to it's non overview mode state.
   void RestoreWindow();
-
-  // Restores stacking of window captions above the windows, then fades out.
-  void Shutdown();
 
   // Forces the managed window to be shown (ie not hidden or minimized) when
   // calling RestoreWindow().
@@ -135,11 +113,6 @@
   // Closes |transform_window_|.
   void CloseWindow();
 
-  // Hides the original window header and sets shape or mask on a window.
-  // When masks are used, rounded corner |radius| can be specified.
-  // TODO(varkha): remove |radius|.
-  void HideHeaderAndSetShape(int radius);
-
   // Sets if the item is dimmed in the overview. Changing the value will also
   // change the visibility of the transform windows.
   void SetDimmed(bool dimmed);
@@ -158,14 +131,7 @@
 
  private:
   class CaptionContainerView;
-  class RoundedContainerView;
   friend class WindowSelectorTest;
-
-  enum class HeaderFadeInMode {
-    ENTER,
-    UPDATE,
-    EXIT,
-  };
 
   // Sets the bounds of this selector's items to |target_bounds| in
   // |root_window_|. The bounds change will be animated as specified
@@ -185,11 +151,8 @@
 
   // 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);
+  // |animation_type|.
+  void UpdateHeaderLayout(OverviewAnimationType animation_type);
 
   // Animates opacity of the |transform_window_| and its caption to |opacity|
   // using |animation_type|.
@@ -197,9 +160,6 @@
 
   // Updates the close buttons accessibility name.
   void UpdateCloseButtonAccessibilityName();
-
-  // Fades out a window caption when exiting overview mode.
-  void FadeOut(std::unique_ptr<views::Widget> widget);
 
   static bool hide_header() { return use_mask_ || use_shape_; }
 
@@ -220,10 +180,6 @@
   // 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
@@ -234,6 +190,9 @@
   // Shadow around the item in overview.
   std::unique_ptr<::wm::Shadow> shadow_;
 
+  // Label background widget used to fade in opacity when moving selection.
+  std::unique_ptr<views::Widget> window_label_selector_;
+
   // Container view that owns |window_label_button_view_| and |close_button_|.
   // Only used with Material Design.
   CaptionContainerView* caption_container_view_;
@@ -247,15 +206,11 @@
   // A close button for the window in this item. Owned by the
   // |caption_container_view_| with Material Design or by |close_button_widget_|
   // otherwise.
-  OverviewCloseButton* close_button_;
+  views::ImageButton* 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.
-  RoundedContainerView* background_view_;
 
   // If true, mask the original window header while in overview and make corners
   // rounded using a mask layer. This has performance implications so it can be