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

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

Issue 2456623002: Fixes to WindowTreeHostMus (Closed)
Patch Set: merge 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
« no previous file with comments | « ui/aura/mus/in_flight_change.h ('k') | ui/aura/mus/mus_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5c2ade7872dd22cd3fd2fb5b058b80ee42a0cd7c..9d82fa9dfe1ca239b0c0d4ced126d335c214c258 100644
--- a/ui/aura/mus/in_flight_change.cc
+++ b/ui/aura/mus/in_flight_change.cc
@@ -29,9 +29,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) {
@@ -40,7 +42,7 @@ void InFlightBoundsChange::SetRevertValueFrom(const InFlightChange& change) {
}
void InFlightBoundsChange::Revert() {
- window()->SetBoundsFromServer(revert_bounds_);
+ window_tree_client_->SetWindowBoundsFromServer(window(), revert_bounds_);
}
// InFlightDragChange -----------------------------------------------------
@@ -188,9 +190,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() {}
@@ -201,7 +205,7 @@ void InFlightVisibleChange::SetRevertValueFrom(const InFlightChange& change) {
}
void InFlightVisibleChange::Revert() {
- window()->SetVisibleFromServer(revert_visible_);
+ window_tree_client_->SetWindowVisibleFromServer(window(), revert_visible_);
}
// InFlightOpacityChange -------------------------------------------------------
« no previous file with comments | « ui/aura/mus/in_flight_change.h ('k') | ui/aura/mus/mus_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698