Remove TransparentActivateWindowButton from Overview Mode

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 "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/scoped_window_targeter.h"
 #include "ui/aura/window_observer.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"
 
 namespace aura {
 class Window;
 }
 
 namespace views {
-class Label;
+class LabelButton;
 class Widget;
 }
 
 namespace ash {
 
+class OverviewWindowTargeter;
+
 // This class represents an item in overview mode.
-class ASH_EXPORT WindowSelectorItem
-    : public views::ButtonListener,
-      public aura::WindowObserver,
-      public TransparentActivateWindowButtonDelegate {
+class ASH_EXPORT WindowSelectorItem : public views::ButtonListener,
+                                      public aura::WindowObserver {
  public:
   explicit WindowSelectorItem(aura::Window* window);
   ~WindowSelectorItem() override;
 
   aura::Window* GetWindow();
 
   // Returns the root window on which this item is shown.
   aura::Window* root_window() { return root_window_; }
 
   // Returns true if |target| is contained in this WindowSelectorItem.
@@ skipping 31 matching lines @@
 
   const gfx::Rect& target_bounds() const { return target_bounds_; }
 
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   // aura::WindowObserver:
   void OnWindowDestroying(aura::Window* window) override;
   void OnWindowTitleChanged(aura::Window* window) override;
 
-  // ash::TransparentActivateWindowButtonDelegate:
-  void Select() override;
-
  private:
   friend class WindowSelectorTest;
 
+  // LabelButton shown under each of the windows.
+  class OverviewLabelButton;
+
   // 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's bounds to |target_bounds|. Will create a new
-  // window label and fade it in if it doesn't exist. The bounds change is
+  // Updates the window label's bounds to |target_bounds|. The bounds change is
   // animated as specified by the |animation_type|.
   void UpdateWindowLabels(const gfx::Rect& target_bounds,
                           OverviewAnimationType animation_type);
 
   // Initializes window_label_.
-  void CreateWindowLabel(const base::string16& title);
-
-  // Updates the bounds and accessibility names for all the transparent
-  // overlays.
-  void UpdateSelectorButtons();
+  void CreateWindowLabel();
 
   // Updates the close button's bounds. Any change in bounds will be animated
   // from the current bounds to the new bounds as per the |animation_type|.
   void UpdateCloseButtonLayout(OverviewAnimationType animation_type);
 
   // Updates the close buttons accessibility name.
   void UpdateCloseButtonAccessibilityName();
 
   // True if the item is being shown in the overview, false if it's being
   // filtered.
   bool dimmed_;
 
   // The root window this item is being displayed on.
   aura::Window* root_window_;
 
   // The contained Window's wrapper.
   ScopedTransformOverviewWindow transform_window_;
 
   // The target bounds this selector item is fit within.
   gfx::Rect target_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_;
 
-  // View for the label under the window.
-  views::Label* window_label_view_;
+  // View for the label button under the window.
+  OverviewLabelButton* window_label_button_view_;
 
   // The close buttons widget container.
   views::Widget close_button_widget_;
 
   // An easy to access close button for the window in this item. Owned by the
   // 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_;
+  // Reference to the targeter implemented by the scoped window targeter.
+  OverviewWindowTargeter* overview_window_targeter_;
+
+  // Stores and restores on exit the actual window targeter.
+  scoped_ptr<aura::ScopedWindowTargeter> scoped_window_targeter_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowSelectorItem);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_