Chromium Code Reviews| 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 f57a5cbd71debe5cc2b55a0b486cdbfc755763da..7fb3d683d08bddfba225f9f1b6dcd0e0b69df112 100644 |
| --- a/ash/wm/overview/scoped_transform_overview_window.h |
| +++ b/ash/wm/overview/scoped_transform_overview_window.h |
| @@ -19,6 +19,10 @@ |
| class SkRegion; |
| +namespace aura { |
| +class Window; |
| +} |
| + |
| namespace gfx { |
| class Rect; |
| } |
| @@ -30,7 +34,6 @@ class Widget; |
| namespace ash { |
| class ScopedOverviewAnimationSettings; |
| -class WmWindow; |
| // Manages a window, and it's transient children, in the overview mode. This |
| // class allows transforming the windows with a helper to determine the best |
| @@ -63,7 +66,7 @@ class ASH_EXPORT ScopedTransformOverviewWindow : public ui::EventHandler { |
| static gfx::Transform GetTransformForRect(const gfx::Rect& src_rect, |
| const gfx::Rect& dst_rect); |
| - explicit ScopedTransformOverviewWindow(WmWindow* window); |
| + explicit ScopedTransformOverviewWindow(aura::Window* window); |
| ~ScopedTransformOverviewWindow() override; |
| // Starts an animation sequence which will use animation settings specified by |
| @@ -85,7 +88,7 @@ class ASH_EXPORT ScopedTransformOverviewWindow : public ui::EventHandler { |
| ScopedAnimationSettings* animation_settings); |
| // Returns true if this window selector window contains the |target|. |
| - bool Contains(const WmWindow* target) const; |
| + bool Contains(const aura::Window* target) const; |
| // Returns the original target bounds of all transformed windows. |
| gfx::Rect GetTargetBoundsInScreen() const; |
| @@ -117,7 +120,7 @@ class ASH_EXPORT ScopedTransformOverviewWindow : public ui::EventHandler { |
| // Applies the |transform| to the overview window and all of its transient |
| // children. |
| - void SetTransform(WmWindow* root_window, const gfx::Transform& transform); |
| + void SetTransform(aura::Window* root_window, const gfx::Transform& transform); |
| // Set's the opacity of the managed windows. |
| void SetOpacity(float opacity); |
| @@ -132,21 +135,21 @@ class ASH_EXPORT ScopedTransformOverviewWindow : public ui::EventHandler { |
| // Creates/Deletes a mirror window for minimized windows. |
| void UpdateMirrorWindowForMinimizedState(); |
| - WmWindow* window() const { return window_; } |
| + aura::Window* window() const { return window_; } |
| // Closes the transient root of the window managed by |this|. |
| void Close(); |
| - // Returns the window used to show the content in overview mdoe. |
| - // For minmiezd window, this will be a window that hosts mirrored layers. |
| - WmWindow* GetOverviewWindow() const; |
| + // Returns the window used to show the content in overview mode. |
| + // For minimized window, this will be a window that hosts mirrored layers. |
| + aura::Window* GetOverviewWindow() const; |
| // Ensures that a window is visible by setting its opacity to 1. |
| void EnsureVisible(); |
| // Returns the window created for minimized window, or nullptr |
| // if it does not exit. |
|
msw
2017/05/23 22:50:24
nit: s/exit/exist/, poor comment spelling/grammar
varkha
2017/05/24 15:29:15
Done. Fixed a few places I could spot, see if you
|
| - WmWindow* GetOverviewWindowForMinimizedState() const; |
| + aura::Window* GetOverviewWindowForMinimizedState() const; |
| // ui::EventHandler: |
| void OnGestureEvent(ui::GestureEvent* event) override; |
| @@ -164,7 +167,7 @@ class ASH_EXPORT ScopedTransformOverviewWindow : public ui::EventHandler { |
| static void SetImmediateCloseForTests(); |
| // A weak pointer to the real window in the overview. |
| - WmWindow* window_; |
| + aura::Window* window_; |
| // Original window shape, if it was set on a window. |
| std::unique_ptr<SkRegion> original_window_shape_; |