Reland f5157480667e99269e0062e9df1df3875db with fix for compile failure.

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"
@@ skipping 57 matching lines @@
   // 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;
 
   WmWindow* GetWindow();
 
   // Returns the root window on which this item is shown.
   WmWindow* root_window() { return root_window_; }
@@ skipping 161 matching lines @@
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_