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

Unified Diff: ash/wm/maximize_mode/maximize_mode_window_state.h

Issue 2895713002: [mus+ash] Removes WmWindow from ash/wm/mru_window_tracker and overview mode (Closed)
Patch Set: Ash unittests compile (cleanup #include wm_window.h) Created 3 years, 7 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/maximize_mode/maximize_mode_window_state.h
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.h b/ash/wm/maximize_mode/maximize_mode_window_state.h
index 7cadc5f6a8a0e08dc21ec601701b641e2c858be7..4f8faa82e3ae8e2cbf5f0e81159c6ab88c5f81a4 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.h
+++ b/ash/wm/maximize_mode/maximize_mode_window_state.h
@@ -10,9 +10,12 @@
#include "ash/wm/window_state.h"
#include "base/macros.h"
+namespace aura {
+class Window;
msw 2017/05/23 22:50:24 optional nit: not needed (pulled in via ash/wm/win
varkha 2017/05/24 15:29:14 Done.
+}
+
namespace ash {
class MaximizeModeWindowManager;
-class WmWindow;
// The MaximizeModeWindowState implementation which reduces all possible window
// states to minimized and maximized. If a window cannot be maximized it will be
@@ -27,7 +30,8 @@ class MaximizeModeWindowState : public wm::WindowState::State {
// state handler. Upon destruction it will restore the previous state handler
// and call |creator::WindowStateDestroyed()| to inform that the window mode
// was reverted to the old window manager.
- MaximizeModeWindowState(WmWindow* window, MaximizeModeWindowManager* creator);
+ MaximizeModeWindowState(aura::Window* window,
+ MaximizeModeWindowManager* creator);
~MaximizeModeWindowState() override;
void set_ignore_wm_events(bool ignore) { ignore_wm_events_ = ignore; }
@@ -70,7 +74,7 @@ class MaximizeModeWindowState : public wm::WindowState::State {
std::unique_ptr<wm::WindowState::State> old_state_;
// The state object for this object which owns this instance.
msw 2017/05/23 22:50:24 aside: lol comment
varkha 2017/05/24 15:29:14 Done.
- WmWindow* window_;
+ aura::Window* window_;
// The creator which needs to be informed when this state goes away.
MaximizeModeWindowManager* creator_;

Powered by Google App Engine
This is Rietveld 408576698