Eliminate WindowTreeConnection

ui/views/mus/native_widget_mus.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/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_property.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 #include "components/mus/public/interfaces/cursor.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/aura/window.h"
@@ skipping 489 matching lines @@
     DCHECK(!window_);
     delete native_widget_delegate_;
   } else {
     if (window_)
       window_->set_input_event_handler(nullptr);
     CloseNow();
   }
 }
 
 // static
-void NativeWidgetMus::NotifyFrameChanged(
-    mus::WindowTreeConnection* connection) {
-  for (mus::Window* window : connection->GetRoots()) {
+void NativeWidgetMus::NotifyFrameChanged(mus::WindowTreeClient* client) {
+  for (mus::Window* window : client->GetRoots()) {
     NativeWidgetMus* native_widget =
         window->GetLocalProperty(kNativeWidgetMusKey);
     if (native_widget && native_widget->GetWidget()->non_client_view()) {
       native_widget->GetWidget()->non_client_view()->Layout();
       native_widget->GetWidget()->non_client_view()->SchedulePaint();
       native_widget->UpdateClientArea();
       native_widget->UpdateHitTestMask();
     }
   }
 }
@@ skipping 435 matching lines @@
 
 void NativeWidgetMus::Activate() {
   if (window_)
     window_->SetFocus();
   static_cast<aura::client::ActivationClient*>(focus_client_.get())
       ->ActivateWindow(content_);
 }
 
 void NativeWidgetMus::Deactivate() {
   if (IsActive())
-    window_->connection()->ClearFocus();
+    window_->window_tree()->ClearFocus();
 }
 
 bool NativeWidgetMus::IsActive() const {
   mus::Window* focused =
-      window_ ? window_->connection()->GetFocusedWindow() : nullptr;
+      window_ ? window_->window_tree()->GetFocusedWindow() : nullptr;
   return focused && window_->Contains(focused);
 }
 
 void NativeWidgetMus::SetAlwaysOnTop(bool always_on_top) {
   if (window_) {
     window_->SetSharedProperty<bool>(
         mus::mojom::WindowManager::kAlwaysOnTop_Property, always_on_top);
   }
 }
 
@@ skipping 102 matching lines @@
 
 bool NativeWidgetMus::IsMouseEventsEnabled() const {
   // NOTIMPLEMENTED();
   return true;
 }
 
 void NativeWidgetMus::ClearNativeFocus() {
   if (!IsActive())
     return;
   mus::Window* focused =
-      window_ ? window_->connection()->GetFocusedWindow() : nullptr;
+      window_ ? window_->window_tree()->GetFocusedWindow() : nullptr;
   if (focused && window_->Contains(focused) && focused != window_)
     window_->SetFocus();
   // Move aura-focus back to |content_|, so that the Widget still receives
   // events correctly.
   aura::client::GetFocusClient(content_)->ResetFocusWithinActiveWindow(
       content_);
 }
 
 gfx::Rect NativeWidgetMus::GetWorkAreaBoundsInScreen() const {
   // NOTIMPLEMENTED();
@@ skipping 238 matching lines @@
 
   gfx::Path mask_path;
   native_widget_delegate_->GetHitTestMask(&mask_path);
   // TODO(jamescook): Use the full path for the mask.
   gfx::Rect mask_rect =
       gfx::ToEnclosingRect(gfx::SkRectToRectF(mask_path.getBounds()));
   window_->SetHitTestMask(mask_rect);
 }
 
 }  // namespace views