Renames some WindowManager classes

components/mus/ws/window_tree_host_impl.h

 // 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.
 
 #ifndef COMPONENTS_MUS_WS_WINDOW_TREE_HOST_IMPL_H_
 #define COMPONENTS_MUS_WS_WINDOW_TREE_HOST_IMPL_H_
 
 #include <stdint.h>
 
 #include <queue>
@@ skipping 33 matching lines @@
                            public ServerWindowObserver {
  public:
   // TODO(fsamuel): All these parameters are just plumbing for creating
   // DisplayManagers. We should probably just store these common parameters
   // in the DisplayManagerFactory and pass them along on DisplayManager::Create.
   WindowTreeHostImpl(mojom::WindowTreeHostClientPtr client,
                      ConnectionManager* connection_manager,
                      mojo::ApplicationImpl* app_impl,
                      const scoped_refptr<GpuState>& gpu_state,
                      const scoped_refptr<SurfacesState>& surfaces_state,
-                     mojom::WindowManagerPtr window_manater);
+                     mojom::WindowManagerDeprecatedPtr window_manater);
   ~WindowTreeHostImpl() override;
 
   // Initializes state that depends on the existence of a WindowTreeHostImpl.
   void Init(WindowTreeHostDelegate* delegate);
 
   uint32_t id() const { return id_; }
 
   const WindowTreeImpl* GetWindowTree() const;
   WindowTreeImpl* GetWindowTree();
 
@@ skipping 20 matching lines @@
   // drawn, otherwise destruction is immediate.
   void ScheduleSurfaceDestruction(ServerWindow* window);
 
   // Returns the metrics for this viewport.
   const mojom::ViewportMetrics& GetViewportMetrics() const;
 
   mojom::Rotation GetRotation() const;
 
   ConnectionManager* connection_manager() { return connection_manager_; }
 
-  mojom::WindowManager* window_manager() { return window_manager_.get(); }
+  mojom::WindowManagerDeprecated* window_manager() {
+    return window_manager_.get();
+  }
 
   // Returns the root ServerWindow of this viewport.
   ServerWindow* root_window() { return root_.get(); }
   const ServerWindow* root_window() const { return root_.get(); }
 
   void SetFocusedWindow(ServerWindow* window);
   ServerWindow* GetFocusedWindow();
   void DestroyFocusController();
 
   void UpdateTextInputState(ServerWindow* window,
@@ skipping 107 matching lines @@
   void OnWindowDestroyed(ServerWindow* window) override;
 
   const uint32_t id_;
   WindowTreeHostDelegate* delegate_;
   ConnectionManager* const connection_manager_;
   mojom::WindowTreeHostClientPtr client_;
   EventDispatcher event_dispatcher_;
   scoped_ptr<ServerWindow> root_;
   scoped_ptr<DisplayManager> display_manager_;
   scoped_ptr<FocusController> focus_controller_;
-  mojom::WindowManagerPtr window_manager_;
+  mojom::WindowManagerDeprecatedPtr window_manager_;
   mojom::WindowTree* tree_awaiting_input_ack_;
 
   // The last cursor set. Used to track whether we need to change the cursor.
   int32_t last_cursor_;
 
   std::set<WindowId> activation_parents_;
 
   // Set of windows with surfaces that need to be destroyed once the frame
   // draws.
   std::set<ServerWindow*> windows_needing_frame_destruction_;
 
   std::queue<scoped_ptr<QueuedEvent>> event_queue_;
   base::OneShotTimer event_ack_timer_;
 
   mojom::FrameDecorationValuesPtr frame_decoration_values_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostImpl);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_WINDOW_TREE_HOST_IMPL_H_