Index: ash/wm/overview/window_selector_item.h |
diff --git a/ash/wm/overview/window_selector_item.h b/ash/wm/overview/window_selector_item.h |
index 584d2758929ac36442240948171031f7bb494e0e..2597580cecaf0cbef7f7f719f646ce960c1ccbb8 100644 |
--- a/ash/wm/overview/window_selector_item.h |
+++ b/ash/wm/overview/window_selector_item.h |
@@ -7,8 +7,6 @@ |
#include "ash/ash_export.h" |
#include "ash/wm/overview/scoped_transform_overview_window.h" |
-#include "ash/wm/overview/transparent_activate_window_button.h" |
-#include "ash/wm/overview/transparent_activate_window_button_delegate.h" |
#include "base/compiler_specific.h" |
#include "base/memory/scoped_ptr.h" |
#include "ui/aura/window_observer.h" |
@@ -21,7 +19,7 @@ class Window; |
} |
namespace views { |
-class Label; |
+class LabelButton; |
class Widget; |
} |
@@ -32,8 +30,7 @@ namespace ash { |
// any can be selected with a pointer (touch or mouse). |
class ASH_EXPORT WindowSelectorItem |
: public views::ButtonListener, |
- public aura::WindowObserver, |
- public TransparentActivateWindowButtonDelegate { |
+ public aura::WindowObserver { |
public: |
explicit WindowSelectorItem(aura::Window* root_window); |
~WindowSelectorItem() override; |
@@ -101,9 +98,6 @@ class ASH_EXPORT WindowSelectorItem |
// aura::WindowObserver: |
void OnWindowTitleChanged(aura::Window* window) override; |
- // ash::TransparentActivateWindowButtonDelegate: |
- void Select() override; |
- |
private: |
friend class WindowSelectorTest; |
@@ -161,7 +155,7 @@ class ASH_EXPORT WindowSelectorItem |
scoped_ptr<views::Widget> window_label_; |
// View for the label under the window. |
- views::Label* window_label_view_; |
+ views::LabelButton* window_label_button_view_; |
// The close buttons widget container. |
views::Widget close_button_widget_; |
@@ -170,12 +164,6 @@ class ASH_EXPORT WindowSelectorItem |
// close_button_widget_. |
views::ImageButton* close_button_; |
- // Transparent overlay that covers the entire bounds of the |
- // WindowSelectorItem and is stacked in front of all windows but behind each |
- // Windows' own TransparentActivateWindowButton. |
- scoped_ptr<TransparentActivateWindowButton> |
- selector_item_activate_window_button_; |
- |
// List of all Windows added to this and their associated helper classes. |
TransformWindows transform_windows_; |