Eliminate WindowTreeConnection

mash/wm/frame/non_client_frame_view_mash.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 "mash/wm/frame/non_client_frame_view_mash.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "components/mus/public/cpp/window.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 #include "grit/mash_wm_resources.h"
 #include "mash/wm/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "mash/wm/frame/default_header_painter.h"
 #include "mash/wm/frame/frame_border_hit_test_controller.h"
 #include "mash/wm/frame/header_painter.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/events/mojo/input_events_type_converters.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 101 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // NonClientFrameViewMash::HeaderView, views::View overrides:
 
 void NonClientFrameViewMash::HeaderView::Layout() {
   header_painter_->LayoutHeader();
 }
 
 void NonClientFrameViewMash::HeaderView::OnPaint(gfx::Canvas* canvas) {
-  const mus::Window* focused_window = window_->connection()->GetFocusedWindow();
+  const mus::Window* focused_window =
+      window_->window_tree()->GetFocusedWindow();
   const bool paint_as_active =
       focused_window && window_->Contains(focused_window);
   caption_button_container_->SetPaintAsActive(paint_as_active);
 
   HeaderPainter::Mode header_mode = paint_as_active
                                         ? HeaderPainter::MODE_ACTIVE
                                         : HeaderPainter::MODE_INACTIVE;
   header_painter_->PaintHeader(canvas, header_mode);
 }
 
@@ skipping 16 matching lines @@
 
 NonClientFrameViewMash::NonClientFrameViewMash(views::Widget* frame,
                                                mus::Window* window)
     : frame_(frame),
       window_(window),
       header_view_(new HeaderView(frame, window)) {
   // |header_view_| is set as the non client view's overlay view so that it can
   // overlay the web contents in immersive fullscreen.
   AddChildView(header_view_);
   window_->AddObserver(this);
-  window_->connection()->AddObserver(this);
+  window_->window_tree()->AddObserver(this);
 }
 
 NonClientFrameViewMash::~NonClientFrameViewMash() {
   RemoveObservers();
 }
 
 // static
 gfx::Insets NonClientFrameViewMash::GetPreferredClientAreaInsets() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   const int header_height =
@@ skipping 163 matching lines @@
 
 int NonClientFrameViewMash::NonClientTopBorderHeight() const {
   return header_view_->GetPreferredHeight();
 }
 
 void NonClientFrameViewMash::RemoveObservers() {
   if (!window_)
     return;
 
   window_->RemoveObserver(this);
-  window_->connection()->RemoveObserver(this);
+  window_->window_tree()->RemoveObserver(this);
   window_ = nullptr;
 }
 
 void NonClientFrameViewMash::OnWindowTreeFocusChanged(mus::Window* gained_focus,
                                                       mus::Window* lost_focus) {
   const bool had_focus = lost_focus && window_->Contains(lost_focus);
   const bool has_focus = gained_focus && window_->Contains(gained_focus);
   if (had_focus != has_focus)
     SchedulePaint();
 }
 
 }  // namespace wm
 }  // namespace mash