More viewmanager renaming:

mojo/services/view_manager/display_manager.h

 // Copyright 2014 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 MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 #define MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 17 matching lines @@
 namespace gfx {
 class Screen;
 }
 
 namespace mojo {
 
 class ApplicationConnection;
 
 namespace service {
 
-class Node;
-class RootNodeManager;
+class ConnectionManager;
 class DisplayManagerDelegate;
+class ServerView;
 
-// DisplayManager binds the root node to an actual display.
+// DisplayManager binds the root view to an actual display.
 class MOJO_VIEW_MANAGER_EXPORT DisplayManager {
  public:
   DisplayManager(ApplicationConnection* app_connection,
-                  RootNodeManager* root_node,
-                  DisplayManagerDelegate* delegate,
-                  const Callback<void()>& native_viewport_closed_callback);
+                 ConnectionManager* connection_manager,
+                 DisplayManagerDelegate* delegate,
+                 const Callback<void()>& native_viewport_closed_callback);
   virtual ~DisplayManager();
 
-  // Schedules a paint for the specified region of the specified node.
-  void SchedulePaint(const Node* node, const gfx::Rect& bounds);
+  // Schedules a paint for the specified region of the specified view.
+  void SchedulePaint(const ServerView* view, const gfx::Rect& bounds);
 
   // See description above field for details.
   bool in_setup() const { return in_setup_; }
 
  private:
   class RootWindowDelegateImpl;
 
   void OnCompositorCreated();
 
   DisplayManagerDelegate* delegate_;
 
-  RootNodeManager* root_node_manager_;
+  ConnectionManager* connection_manager_;
 
-  // Returns true if adding the root node's window to |window_tree_host_|.
+  // Returns true if adding the root view's window to |window_tree_host_|.
   bool in_setup_;
 
   scoped_ptr<RootWindowDelegateImpl> window_delegate_;
 
   // Owned by its parent aura::Window.
   aura::Window* root_window_;
 
   scoped_ptr<gfx::Screen> screen_;
   scoped_ptr<aura::WindowTreeHost> window_tree_host_;
   scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace service
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_