Eliminate WindowTreeConnection

components/mus/public/cpp/lib/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 "components/mus/public/cpp/lib/in_flight_change.h"
 
 #include "components/mus/public/cpp/lib/window_private.h"
-#include "components/mus/public/cpp/lib/window_tree_client_impl.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 
 namespace mus {
 
 // InFlightChange -------------------------------------------------------------
 
 InFlightChange::InFlightChange(Window* window, ChangeType type)
     : window_(window), change_type_(type) {}
 
 InFlightChange::~InFlightChange() {}
 
@@ skipping 35 matching lines @@
   CHECK(false);
 }
 
 void CrashInFlightChange::Revert() {
   CHECK(false);
 }
 
 // InFlightWindowChange -------------------------------------------------------
 
 InFlightWindowTreeClientChange::InFlightWindowTreeClientChange(
-    WindowTreeClientImpl* client_connection,
+    WindowTreeClient* client,
     Window* revert_value,
     ChangeType type)
     : InFlightChange(nullptr, type),
-      connection_(client_connection),
+      client_(client),
       revert_window_(nullptr) {
   SetRevertWindow(revert_value);
 }
 
 InFlightWindowTreeClientChange::~InFlightWindowTreeClientChange() {
   SetRevertWindow(nullptr);
 }
 
 void InFlightWindowTreeClientChange::SetRevertValueFrom(
     const InFlightChange& change) {
   SetRevertWindow(static_cast<const InFlightWindowTreeClientChange&>(change)
                       .revert_window_);
 }
 
 void InFlightWindowTreeClientChange::SetRevertWindow(Window* window) {
   if (revert_window_)
     revert_window_->RemoveObserver(this);
   revert_window_ = window;
   if (revert_window_)
     revert_window_->AddObserver(this);
 }
 
 void InFlightWindowTreeClientChange::OnWindowDestroying(Window* window) {
   SetRevertWindow(nullptr);
 }
 
 // InFlightCaptureChange ------------------------------------------------------
 
 InFlightCaptureChange::InFlightCaptureChange(
-    WindowTreeClientImpl* client_connection,
-    Window* revert_value)
-    : InFlightWindowTreeClientChange(client_connection,
+    WindowTreeClient* client, Window* revert_value)
+    : InFlightWindowTreeClientChange(client,
                                      revert_value,
                                      ChangeType::CAPTURE) {}
 
 InFlightCaptureChange::~InFlightCaptureChange() {}
 
 void InFlightCaptureChange::Revert() {
-  connection()->LocalSetCapture(revert_window());
+  client()->LocalSetCapture(revert_window());
 }
 
 // InFlightFocusChange --------------------------------------------------------
 
 InFlightFocusChange::InFlightFocusChange(
-    WindowTreeClientImpl* client_connection,
+    WindowTreeClient* client,
     Window* revert_value)
-    : InFlightWindowTreeClientChange(client_connection,
+    : InFlightWindowTreeClientChange(client,
                                      revert_value,
                                      ChangeType::FOCUS) {}
 
 InFlightFocusChange::~InFlightFocusChange() {}
 
 void InFlightFocusChange::Revert() {
-  connection()->LocalSetFocus(revert_window());
+  client()->LocalSetFocus(revert_window());
 }
 
 // InFlightPropertyChange -----------------------------------------------------
 
 InFlightPropertyChange::InFlightPropertyChange(
     Window* window,
     const std::string& property_name,
     const mojo::Array<uint8_t>& revert_value)
     : InFlightChange(window, ChangeType::PROPERTY),
       property_name_(property_name),
@@ skipping 78 matching lines @@
 
 InFlightSetModalChange::~InFlightSetModalChange() {}
 
 void InFlightSetModalChange::SetRevertValueFrom(const InFlightChange& change) {}
 
 void InFlightSetModalChange::Revert() {
   WindowPrivate(window()).LocalUnsetModal();
 }
 
 }  // namespace mus