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

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

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.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc
index 904c245a346990157170945bd1e2a860675285fb..7396282d6a4db19c1ba535ca97742e60bfd16cd6 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc
@@ -91,13 +91,13 @@ void MaximizeModeWindowState::UpdateWindowPosition(
}
MaximizeModeWindowState::MaximizeModeWindowState(
- WmWindow* window,
+ aura::Window* window,
MaximizeModeWindowManager* creator)
: window_(window),
creator_(creator),
- current_state_type_(window->GetWindowState()->GetStateType()),
+ current_state_type_(wm::GetWindowState(window)->GetStateType()),
defer_bounds_updates_(false) {
- old_state_.reset(window_->GetWindowState()
+ old_state_.reset(wm::GetWindowState(window)
->SetStateObject(std::unique_ptr<State>(this))
.release());
}
@@ -118,7 +118,7 @@ void MaximizeModeWindowState::SetDeferBoundsUpdates(bool defer_bounds_updates) {
defer_bounds_updates_ = defer_bounds_updates;
if (!defer_bounds_updates_)
- UpdateBounds(window_->GetWindowState(), true);
+ UpdateBounds(wm::GetWindowState(window_), true);
}
void MaximizeModeWindowState::OnWMEvent(wm::WindowState* window_state,

Powered by Google App Engine
This is Rietveld 408576698