Fixes to WindowTreeHostMus

ui/aura/mus/in_flight_change.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/mus/in_flight_change.h"
 
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 
 namespace aura {
 
 // InFlightChange -------------------------------------------------------------
 
 InFlightChange::InFlightChange(WindowMus* window, ChangeType type)
     : window_(window), change_type_(type) {}
 
 InFlightChange::~InFlightChange() {}
 
 bool InFlightChange::Matches(const InFlightChange& change) const {
   DCHECK(change.window_ == window_ && change.change_type_ == change_type_);
   return true;
 }
 
 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) {
   revert_bounds_ =
       static_cast<const InFlightBoundsChange&>(change).revert_bounds_;
 }
 
 void InFlightBoundsChange::Revert() {
-  window()->SetBoundsFromServer(revert_bounds_);
+  window_tree_client_->SetWindowBoundsFromServer(window(), revert_bounds_);
 }
 
 // InFlightDragChange -----------------------------------------------------
 
 InFlightDragChange::InFlightDragChange(WindowMus* window, ChangeType type)
     : InFlightChange(window, type) {
   DCHECK(type == ChangeType::MOVE_LOOP || type == ChangeType::DRAG_LOOP);
 }
 
 void InFlightDragChange::SetRevertValueFrom(const InFlightChange& change) {}
@@ skipping 127 matching lines @@
   revert_cursor_ =
       static_cast<const InFlightPredefinedCursorChange&>(change).revert_cursor_;
 }
 
 void InFlightPredefinedCursorChange::Revert() {
   window()->SetPredefinedCursorFromServer(revert_cursor_);
 }
 
 // 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() {}
 
 void InFlightVisibleChange::SetRevertValueFrom(const InFlightChange& change) {
   revert_visible_ =
       static_cast<const InFlightVisibleChange&>(change).revert_visible_;
 }
 
 void InFlightVisibleChange::Revert() {
-  window()->SetVisibleFromServer(revert_visible_);
+  window_tree_client_->SetWindowVisibleFromServer(window(), revert_visible_);
 }
 
 // InFlightOpacityChange -------------------------------------------------------
 
 InFlightOpacityChange::InFlightOpacityChange(WindowMus* window,
                                              float revert_value)
     : InFlightChange(window, ChangeType::OPACITY),
       revert_opacity_(revert_value) {}
 
 InFlightOpacityChange::~InFlightOpacityChange() {}
@@ skipping 15 matching lines @@
 InFlightSetModalChange::~InFlightSetModalChange() {}
 
 void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {}
 
 void InFlightSetModalChange::Revert() {
   // TODO: modality is stored in keys in aura.
   // WindowPrivate(window()).LocalUnsetModal();
 }
 
 }  // namespace aura