Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3757)

Unified Diff: ash/wm/overview/scoped_transform_overview_window.h

Issue 810033010: Remove TransparentActivateWindowButton from Overview Mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed latest nits Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/overview/scoped_transform_overview_window.h
diff --git a/ash/wm/overview/scoped_transform_overview_window.h b/ash/wm/overview/scoped_transform_overview_window.h
index 99ad65896d59e6b31429f7cc601e7cc2536bb0bc..8a2dec7f445d2812cd82cf46cfa9b8a52dda9733 100644
--- a/ash/wm/overview/scoped_transform_overview_window.h
+++ b/ash/wm/overview/scoped_transform_overview_window.h
@@ -6,8 +6,6 @@
#define ASH_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
#include "ash/wm/overview/scoped_overview_animation_settings.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 "base/memory/scoped_vector.h"
@@ -35,8 +33,7 @@ class ScopedWindowCopy;
// class allows transforming the windows with a helper to determine the best
// fit in certain bounds. The window's state is restored on destruction of this
// object.
-class ScopedTransformOverviewWindow
- : public TransparentActivateWindowButtonDelegate {
+class ScopedTransformOverviewWindow {
public:
typedef ScopedVector<ScopedOverviewAnimationSettings> ScopedAnimationSettings;
@@ -51,7 +48,7 @@ class ScopedTransformOverviewWindow
const gfx::Rect& dst_rect);
explicit ScopedTransformOverviewWindow(aura::Window* window);
- ~ScopedTransformOverviewWindow() override;
+ ~ScopedTransformOverviewWindow();
gfx::Transform get_overview_transform() const { return overview_transform_; }
@@ -59,10 +56,6 @@ class ScopedTransformOverviewWindow
overview_transform_ = transform;
}
- TransparentActivateWindowButton* activate_button() {
- return activate_button_.get();
- }
-
// Starts an animation sequence which will use animation settings specified by
// |animation_type|. The |animation_settings| container is populated with
// scoped entities and the container should be destroyed at the end of the
@@ -115,9 +108,6 @@ class ScopedTransformOverviewWindow
// Closes the transient root of the window managed by |this|.
void Close();
- // ash::TransparentActivateWindowButtonDelegate:
- void Select() override;
-
private:
// Shows the window if it was minimized.
void ShowWindowIfMinimized();
@@ -125,9 +115,6 @@ class ScopedTransformOverviewWindow
// A weak pointer to the real window in the overview.
aura::Window* window_;
- // The transparent overlay that captures events.
- scoped_ptr<TransparentActivateWindowButton> activate_button_;
-
// If true, the window was minimized and should be restored if the window
// was not selected.
bool minimized_;

Powered by Google App Engine
This is Rietveld 408576698