Renames aura::client::WindowTreeClient to WindowParentingClient

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

 // Copyright (c) 2012 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/widget/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/focus_client.h"
-#include "ui/aura/client/window_tree_client.h"
+#include "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/compositor/layer.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point_conversions.h"
@@ skipping 136 matching lines @@
         child_window_(NULL) {}
 
   ~DesktopNativeWidgetTopLevelHandler() override {}
 
   Widget* top_level_widget_;
   aura::Window* child_window_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetTopLevelHandler);
 };
 
-class DesktopNativeWidgetAuraWindowTreeClient :
-    public aura::client::WindowTreeClient {
+class DesktopNativeWidgetAuraWindowParentingClient
+    : public aura::client::WindowParentingClient {
  public:
-  explicit DesktopNativeWidgetAuraWindowTreeClient(
+  explicit DesktopNativeWidgetAuraWindowParentingClient(
       aura::Window* root_window)
       : root_window_(root_window) {
-    aura::client::SetWindowTreeClient(root_window_, this);
+    aura::client::SetWindowParentingClient(root_window_, this);
   }
-  ~DesktopNativeWidgetAuraWindowTreeClient() override {
-    aura::client::SetWindowTreeClient(root_window_, NULL);
+  ~DesktopNativeWidgetAuraWindowParentingClient() override {
+    aura::client::SetWindowParentingClient(root_window_, NULL);
   }
 
-  // Overridden from client::WindowTreeClient:
+  // Overridden from client::WindowParentingClient:
   aura::Window* GetDefaultParent(aura::Window* context,
                                  aura::Window* window,
                                  const gfx::Rect& bounds) override {
     bool is_fullscreen = window->GetProperty(aura::client::kShowStateKey) ==
         ui::SHOW_STATE_FULLSCREEN;
     bool is_menu = window->type() == ui::wm::WINDOW_TYPE_MENU;
 
     if (is_fullscreen || is_menu) {
       bool root_is_always_on_top = false;
       internal::NativeWidgetPrivate* native_widget =
           DesktopNativeWidgetAura::ForWindow(root_window_);
       if (native_widget)
         root_is_always_on_top = native_widget->IsAlwaysOnTop();
 
       return DesktopNativeWidgetTopLevelHandler::CreateParentWindow(
           window, bounds, is_fullscreen, root_is_always_on_top);
     }
     return root_window_;
   }
 
  private:
   aura::Window* root_window_;
 
-  DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAuraWindowTreeClient);
+  DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAuraWindowParentingClient);
 };
 
 }  // namespace
 
 class RootWindowDestructionObserver : public aura::WindowObserver {
  public:
   explicit RootWindowDestructionObserver(DesktopNativeWidgetAura* parent)
     : parent_(parent) {}
   ~RootWindowDestructionObserver() override {}
 
@@ skipping 67 matching lines @@
   // DesktopWindowTreeHost owns the ActivationController which ShadowController
   // references. Make sure we destroy ShadowController early on.
   shadow_controller_.reset();
   tooltip_manager_.reset();
   if (tooltip_controller_.get()) {
     host_->window()->RemovePreTargetHandler(tooltip_controller_.get());
     aura::client::SetTooltipClient(host_->window(), NULL);
     tooltip_controller_.reset();
   }
 
-  window_tree_client_.reset();  // Uses host_->dispatcher() at destruction.
+  window_parenting_client_.reset();  // Uses host_->dispatcher() at destruction.
 
   capture_client_.reset();  // Uses host_->dispatcher() at destruction.
 
   focus_manager_event_handler_.reset();
 
   // FocusController uses |content_window_|. Destroy it now so that we don't
   // have to worry about the possibility of FocusController attempting to use
   // |content_window_| after it's been destroyed but before all child windows
   // have been destroyed.
   host_->window()->RemovePreTargetHandler(focus_client_.get());
@@ skipping 159 matching lines @@
   aura::client::SetDragDropClient(host_->window(),
                                   drag_drop_client_.get());
 
   static_cast<aura::client::FocusClient*>(focus_client_.get())->
       FocusWindow(content_window_);
 
   OnHostResized(host());
 
   host_->AddObserver(this);
 
-  window_tree_client_.reset(
-      new DesktopNativeWidgetAuraWindowTreeClient(host_->window()));
+  window_parenting_client_.reset(
+      new DesktopNativeWidgetAuraWindowParentingClient(host_->window()));
   drop_helper_.reset(new DropHelper(GetWidget()->GetRootView()));
   aura::client::SetDragDropDelegate(content_window_, this);
 
   if (params.type != Widget::InitParams::TYPE_TOOLTIP) {
     tooltip_manager_.reset(new TooltipManagerAura(GetWidget()));
     tooltip_controller_.reset(
         new corewm::TooltipController(
             desktop_window_tree_host_->CreateTooltip()));
     aura::client::SetTooltipClient(host_->window(),
                                    tooltip_controller_.get());
@@ skipping 697 matching lines @@
   if (cursor_reference_count_ == 0) {
     // We are the last DesktopNativeWidgetAura instance, and we are responsible
     // for cleaning up |cursor_manager_|.
     delete cursor_manager_;
     native_cursor_manager_ = NULL;
     cursor_manager_ = NULL;
   }
 }
 
 }  // namespace views