Renames aura::client::WindowTreeClient to WindowParentingClient

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.
 
 // This has to be before any other includes, else default is picked up.
 // See base/logging for details on this.
 #define NOTIMPLEMENTED_POLICY 5
 
 #include "ui/views/mus/native_widget_mus.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_observer.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "services/ui/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/client/window_parenting_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
@@ skipping 90 matching lines @@
                       const gfx::Rect& requested_bounds) override {
     SetChildBoundsDirect(child, requested_bounds);
   }
 
   aura::Window* outer_;
   aura::Window* inner_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentWindowLayoutManager);
 };
 
-class NativeWidgetMusWindowTreeClient : public aura::client::WindowTreeClient {
+class NativeWidgetMusWindowParentingClient
+    : public aura::client::WindowParentingClient {
  public:
-  explicit NativeWidgetMusWindowTreeClient(aura::Window* root_window)
+  explicit NativeWidgetMusWindowParentingClient(aura::Window* root_window)
       : root_window_(root_window) {
-    aura::client::SetWindowTreeClient(root_window_, this);
+    aura::client::SetWindowParentingClient(root_window_, this);
   }
-  ~NativeWidgetMusWindowTreeClient() override {
-    aura::client::SetWindowTreeClient(root_window_, nullptr);
+  ~NativeWidgetMusWindowParentingClient() override {
+    aura::client::SetWindowParentingClient(root_window_, nullptr);
   }
 
-  // Overridden from client::WindowTreeClient:
+  // Overridden from client::WindowParentingClient:
   aura::Window* GetDefaultParent(aura::Window* context,
                                  aura::Window* window,
                                  const gfx::Rect& bounds) override {
     return root_window_;
   }
 
  private:
   aura::Window* root_window_;
 
-  DISALLOW_COPY_AND_ASSIGN(NativeWidgetMusWindowTreeClient);
+  DISALLOW_COPY_AND_ASSIGN(NativeWidgetMusWindowParentingClient);
 };
 
 // A screen position client that applies the offset of the ui::Window.
 class ScreenPositionClientMus : public wm::DefaultScreenPositionClient {
  public:
   explicit ScreenPositionClientMus(ui::Window* mus_window)
       : mus_window_(mus_window) {}
   ~ScreenPositionClientMus() override {}
 
   // wm::DefaultScreenPositionClient:
@@ skipping 431 matching lines @@
   native_widget_delegate_->OnNativeWidgetDestroying();
 
   tooltip_manager_.reset();
   if (tooltip_controller_.get()) {
     window_tree_host_->window()->RemovePreTargetHandler(
         tooltip_controller_.get());
     aura::client::SetTooltipClient(window_tree_host_->window(), NULL);
     tooltip_controller_.reset();
   }
 
-  window_tree_client_.reset();  // Uses |content_|.
+  window_parenting_client_.reset();  // Uses |content_|.
   capture_client_.reset();      // Uses |content_|.
 
   window_tree_host_->RemoveObserver(this);
   window_tree_host_.reset();
 
   cursor_manager_.reset();  // Uses |window_|.
 
   mus_window_observer_.reset(nullptr);
 
   window_ = nullptr;
@@ skipping 125 matching lines @@
 
   // TODO(erg): Remove this check when ash/mus/move_event_handler.cc's
   // direct usage of ui::Window::SetPredefinedCursor() is switched to a
   // private method on WindowManagerClient.
   if (!is_parallel_widget_in_window_manager()) {
     cursor_manager_ = base::MakeUnique<wm::CursorManager>(
         base::MakeUnique<NativeCursorManagerMus>(window_));
     aura::client::SetCursorClient(hosted_window, cursor_manager_.get());
   }
 
-  window_tree_client_ =
-      base::MakeUnique<NativeWidgetMusWindowTreeClient>(hosted_window);
+  window_parenting_client_ =
+      base::MakeUnique<NativeWidgetMusWindowParentingClient>(hosted_window);
   hosted_window->AddPreTargetHandler(focus_client_.get());
   hosted_window->SetLayoutManager(
       new ContentWindowLayoutManager(hosted_window, content_));
   capture_client_ =
       base::MakeUnique<MusCaptureClient>(hosted_window, content_, window_);
 
   content_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   content_->Init(params.layer_type);
   if (window_->visible())
     content_->Show();
@@ skipping 796 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