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

Unified Diff: ui/aura/mus/in_flight_change.cc

Issue 2456623002: Fixes to WindowTreeHostMus (Closed)
Patch Set: std::move Created 4 years, 2 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: ui/aura/mus/in_flight_change.cc
diff --git a/ui/aura/mus/in_flight_change.cc b/ui/aura/mus/in_flight_change.cc
index aa70fb0413afa783b66bb27ae6ce16f84ef4d65c..67aa2e5e47d0ba6157646aced049d5b55f3a9b91 100644
--- a/ui/aura/mus/in_flight_change.cc
+++ b/ui/aura/mus/in_flight_change.cc
@@ -27,9 +27,11 @@ void InFlightChange::ChangeFailed() {}
// InFlightBoundsChange -------------------------------------------------------
-InFlightBoundsChange::InFlightBoundsChange(WindowMus* window,
+InFlightBoundsChange::InFlightBoundsChange(WindowTreeClient* window_tree_client,
+ WindowMus* window,
const gfx::Rect& revert_bounds)
: InFlightChange(window, ChangeType::BOUNDS),
+ window_tree_client_(window_tree_client),
revert_bounds_(revert_bounds) {}
void InFlightBoundsChange::SetRevertValueFrom(const InFlightChange& change) {
@@ -38,7 +40,7 @@ void InFlightBoundsChange::SetRevertValueFrom(const InFlightChange& change) {
}
void InFlightBoundsChange::Revert() {
- window()->SetBoundsFromServer(revert_bounds_);
+ window_tree_client_->SetWindowBoundsFromServer(window(), revert_bounds_);
}
// InFlightDragChange -----------------------------------------------------
@@ -186,9 +188,11 @@ void InFlightPredefinedCursorChange::Revert() {
// InFlightVisibleChange -------------------------------------------------------
-InFlightVisibleChange::InFlightVisibleChange(WindowMus* window,
+InFlightVisibleChange::InFlightVisibleChange(WindowTreeClient* client,
+ WindowMus* window,
bool revert_value)
: InFlightChange(window, ChangeType::VISIBLE),
+ window_tree_client_(client),
revert_visible_(revert_value) {}
InFlightVisibleChange::~InFlightVisibleChange() {}
@@ -199,7 +203,7 @@ void InFlightVisibleChange::SetRevertValueFrom(const InFlightChange& change) {
}
void InFlightVisibleChange::Revert() {
- window()->SetVisibleFromServer(revert_visible_);
+ window_tree_client_->SetWindowVisibleFromServer(window(), revert_visible_);
}
// InFlightOpacityChange -------------------------------------------------------

Powered by Google App Engine
This is Rietveld 408576698