Rename RootViewManager to DisplayManager

mojo/services/view_manager/root_node_manager.cc

 // 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.
 
 #include "mojo/services/view_manager/root_node_manager.h"
 
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
@@ skipping 21 matching lines @@
   // Pass in false as native viewport creates the PlatformEventSource.
   aura::Env::CreateInstance(false);
 }
 
 RootNodeManager::Context::~Context() {
   aura::Env::DeleteInstance();
 }
 
 RootNodeManager::RootNodeManager(
     ApplicationConnection* app_connection,
-    RootViewManagerDelegate* view_manager_delegate,
+    DisplayManagerDelegate* display_manager_delegate,
     const Callback<void()>& native_viewport_closed_callback)
     : app_connection_(app_connection),
       next_connection_id_(1),
-      root_view_manager_(app_connection,
-                         this,
-                         view_manager_delegate,
-                         native_viewport_closed_callback),
+      display_manager_(app_connection,
+                       this,
+                       display_manager_delegate,
+                       native_viewport_closed_callback),
       root_(new Node(this, RootNodeId())),
       current_change_(NULL) {
 }
 
 RootNodeManager::~RootNodeManager() {
   while (!connections_created_by_connect_.empty())
     delete *(connections_created_by_connect_.begin());
   // All the connections should have been destroyed.
   DCHECK(connection_map_.empty());
   root_.reset();
@@ skipping 177 matching lines @@
   return connection;
 }
 
 void RootNodeManager::OnNodeDestroyed(const Node* node) {
   ProcessNodeDeleted(node->id());
 }
 
 void RootNodeManager::OnNodeHierarchyChanged(const Node* node,
                                              const Node* new_parent,
                                              const Node* old_parent) {
-  if (!root_view_manager_.in_setup())
+  if (!display_manager_.in_setup())
     ProcessNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
 void RootNodeManager::OnNodeBoundsChanged(const Node* node,
                                           const gfx::Rect& old_bounds,
                                           const gfx::Rect& new_bounds) {
   ProcessNodeBoundsChanged(node, old_bounds, new_bounds);
   if (!node->parent())
     return;
 
   // TODO(sky): optimize this.
-  root_view_manager_.SchedulePaint(node->parent(), old_bounds);
-  root_view_manager_.SchedulePaint(node->parent(), new_bounds);
+  display_manager_.SchedulePaint(node->parent(), old_bounds);
+  display_manager_.SchedulePaint(node->parent(), new_bounds);
 }
 
 void RootNodeManager::OnNodeBitmapChanged(const Node* node) {
-  root_view_manager_.SchedulePaint(node, gfx::Rect(node->bounds().size()));
+  display_manager_.SchedulePaint(node, gfx::Rect(node->bounds().size()));
 }
 
 }  // namespace service
 }  // namespace mojo