Renames some WindowManager classes

mash/wm/window_manager_application.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/window_manager_application.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 62 matching lines @@
 void WindowManagerApplication::OnAcceleratorRegistrarDestroyed(
     AcceleratorRegistrarImpl* registrar) {
   accelerator_registrars_.erase(registrar);
 }
 
 void WindowManagerApplication::Initialize(mojo::ApplicationImpl* app) {
   app_ = app;
   tracing_.Initialize(app);
   window_manager_.reset(new WindowManagerImpl());
   // Don't bind to the WindowManager immediately. Wait for OnEmbed() first.
-  mus::mojom::WindowManagerPtr window_manager;
-  requests_.push_back(
-      make_scoped_ptr(new mojo::InterfaceRequest<mus::mojom::WindowManager>(
+  mus::mojom::WindowManagerDeprecatedPtr window_manager;
+  requests_.push_back(make_scoped_ptr(
+      new mojo::InterfaceRequest<mus::mojom::WindowManagerDeprecated>(
           mojo::GetProxy(&window_manager))));
   user_window_controller_.reset(new UserWindowControllerImpl());
   mus::CreateSingleWindowTreeHost(
       app, host_client_binding_.CreateInterfacePtrAndBind(), this,
       &window_tree_host_, std::move(window_manager), window_manager_.get());
 }
 
 bool WindowManagerApplication::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
   connection->AddService<mash::wm::mojom::UserWindowController>(this);
   connection->AddService<mus::mojom::AcceleratorRegistrar>(this);
-  connection->AddService<mus::mojom::WindowManager>(this);
+  connection->AddService<mus::mojom::WindowManagerDeprecated>(this);
   return true;
 }
 
 void WindowManagerApplication::OnAccelerator(uint32_t id,
                                              mus::mojom::EventPtr event) {
   switch (id) {
     case kWindowSwitchCmd:
       window_tree_host_->ActivateNextWindow();
       break;
     default:
@@ skipping 77 matching lines @@
   }
   accelerator_registrars_.insert(new AcceleratorRegistrarImpl(
       window_tree_host_.get(), ++accelerator_registrar_count,
       std::move(request),
       base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
                  base::Unretained(this))));
 }
 
 void WindowManagerApplication::Create(
     mojo::ApplicationConnection* connection,
-    mojo::InterfaceRequest<mus::mojom::WindowManager> request) {
+    mojo::InterfaceRequest<mus::mojom::WindowManagerDeprecated> request) {
   if (root_) {
     window_manager_binding_.AddBinding(window_manager_.get(),
                                        std::move(request));
   } else {
-    requests_.push_back(
-        make_scoped_ptr(new mojo::InterfaceRequest<mus::mojom::WindowManager>(
+    requests_.push_back(make_scoped_ptr(
+        new mojo::InterfaceRequest<mus::mojom::WindowManagerDeprecated>(
             std::move(request))));
   }
 }
 
 void WindowManagerApplication::OnWindowDestroyed(mus::Window* window) {
   DCHECK_EQ(window, root_);
   root_->RemoveObserver(this);
   // Delete the |window_manager_| here so that WindowManager doesn't have to
   // worry about the possibility of |root_| being null.
   window_manager_.reset();
   root_ = nullptr;
 }
 
 void WindowManagerApplication::CreateContainers() {
   for (uint16_t container =
            static_cast<uint16_t>(mojom::Container::ALL_USER_BACKGROUND);
        container < static_cast<uint16_t>(mojom::Container::COUNT);
        ++container) {
     mus::Window* window = root_->connection()->NewWindow();
     DCHECK_EQ(mus::LoWord(window->id()), container)
         << "Containers must be created before other windows!";
     window->SetBounds(root_->bounds());
     window->SetVisible(true);
     root_->AddChild(window);
   }
 }
 
 }  // namespace wm
 }  // namespace mash