Renames aura::client::WindowTreeClient to WindowParentingClient

ui/aura/demo/demo_main.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 <memory>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/power_monitor/power_monitor_device_source.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "cc/surfaces/surface_manager.h"
 #include "third_party/skia/include/core/SkXfermode.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/env.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/compositor/test/in_process_context_factory.h"
 #include "ui/events/event.h"
@@ skipping 58 matching lines @@
   bool HasHitTestMask() const override { return false; }
   void GetHitTestMask(gfx::Path* mask) const override {}
 
  private:
   SkColor color_;
   gfx::Rect window_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(DemoWindowDelegate);
 };
 
-class DemoWindowTreeClient : public aura::client::WindowTreeClient {
+class DemoWindowParentingClient : public aura::client::WindowParentingClient {
  public:
-  explicit DemoWindowTreeClient(aura::Window* window) : window_(window) {
-    aura::client::SetWindowTreeClient(window_, this);
+  explicit DemoWindowParentingClient(aura::Window* window) : window_(window) {
+    aura::client::SetWindowParentingClient(window_, this);
   }
 
-  ~DemoWindowTreeClient() override {
-    aura::client::SetWindowTreeClient(window_, nullptr);
+  ~DemoWindowParentingClient() override {
+    aura::client::SetWindowParentingClient(window_, nullptr);
   }
 
-  // Overridden from aura::client::WindowTreeClient:
+  // Overridden from aura::client::WindowParentingClient:
   aura::Window* GetDefaultParent(aura::Window* context,
                                  aura::Window* window,
                                  const gfx::Rect& bounds) override {
     if (!capture_client_) {
       capture_client_.reset(
           new aura::client::DefaultCaptureClient(window_->GetRootWindow()));
     }
     return window_;
   }
 
  private:
   aura::Window* window_;
 
   std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
-  DISALLOW_COPY_AND_ASSIGN(DemoWindowTreeClient);
+  DISALLOW_COPY_AND_ASSIGN(DemoWindowParentingClient);
 };
 
 int DemoMain() {
 #if defined(USE_X11)
   // This demo uses InProcessContextFactory which uses X on a separate Gpu
   // thread.
   gfx::InitializeThreadedX11();
 #endif
 
   gl::init::InitializeGLOneOff();
@@ skipping 16 matching lines @@
   base::PowerMonitor power_monitor(
       base::WrapUnique(new base::PowerMonitorDeviceSource));
 
   std::unique_ptr<aura::Env> env = aura::Env::CreateInstance();
   env->set_context_factory(context_factory.get());
   std::unique_ptr<aura::TestScreen> test_screen(
       aura::TestScreen::Create(gfx::Size()));
   display::Screen::SetScreenInstance(test_screen.get());
   std::unique_ptr<aura::WindowTreeHost> host(
       test_screen->CreateHostForPrimaryDisplay());
-  std::unique_ptr<DemoWindowTreeClient> window_tree_client(
-      new DemoWindowTreeClient(host->window()));
+  std::unique_ptr<DemoWindowParentingClient> window_parenting_client(
+      new DemoWindowParentingClient(host->window()));
   aura::test::TestFocusClient focus_client;
   aura::client::SetFocusClient(host->window(), &focus_client);
 
   // Create a hierarchy of test windows.
   gfx::Rect window1_bounds(100, 100, 400, 400);
   DemoWindowDelegate window_delegate1(SK_ColorBLUE);
   aura::Window window1(&window_delegate1);
   window1.set_id(1);
   window1.Init(ui::LAYER_TEXTURED);
   window1.SetBounds(window1_bounds);
@@ skipping 29 matching lines @@
 int main(int argc, char** argv) {
   base::CommandLine::Init(argc, argv);
 
   // The exit manager is in charge of calling the dtors of singleton objects.
   base::AtExitManager exit_manager;
 
   base::i18n::InitializeICU();
 
   return DemoMain();
 }