Chromium Code Reviews| Index: ash/wm/mru_window_tracker.h |
| diff --git a/ash/wm/mru_window_tracker.h b/ash/wm/mru_window_tracker.h |
| index abe7daa1fc71a47d6d342edacb506a34ba725240..7f401a00af4bd8e7793cd79b1e1d4b9a220bc945 100644 |
| --- a/ash/wm/mru_window_tracker.h |
| +++ b/ash/wm/mru_window_tracker.h |
| @@ -13,9 +13,11 @@ |
| #include "ui/aura/window_observer.h" |
| #include "ui/wm/public/activation_change_observer.h" |
| -namespace ash { |
| +namespace aura { |
| +class Window; |
|
msw
2017/05/23 22:50:24
optional nit: not needed (per window_observer.h &
varkha
2017/05/24 15:29:15
Done.
|
| +} |
| -class WmWindow; |
| +namespace ash { |
| // Maintains a most recently used list of windows. This is used for window |
| // cycling using Alt+Tab and overview mode. |
| @@ -23,7 +25,7 @@ class ASH_EXPORT MruWindowTracker |
| : public aura::client::ActivationChangeObserver, |
| public aura::WindowObserver { |
| public: |
| - using WindowList = std::vector<WmWindow*>; |
| + using WindowList = std::vector<aura::Window*>; |
|
msw
2017/05/23 22:50:24
optional nit: use aura::Window::Windows
varkha
2017/05/24 15:29:15
aura::Window is only forward defined at this point
|
| MruWindowTracker(); |
| ~MruWindowTracker() override; |
| @@ -46,7 +48,7 @@ class ASH_EXPORT MruWindowTracker |
| private: |
| // Updates the mru_windows_ list to insert/move |active_window| at/to the |
| // front. |
| - void SetActiveWindow(WmWindow* active_window); |
| + void SetActiveWindow(aura::Window* active_window); |
| // Overridden from aura::client::ActivationChangeObserver: |
| void OnWindowActivated(ActivationReason reason, |
| @@ -58,7 +60,7 @@ class ASH_EXPORT MruWindowTracker |
| // List of windows that have been activated in containers that we cycle |
| // through, sorted by most recently used. |
| - std::list<WmWindow*> mru_windows_; |
| + std::list<aura::Window*> mru_windows_; |
| bool ignore_window_activations_; |