Revert of Wires up view manager to an actual display

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/services/view_manager/view_manager_connection.h"
-#include "ui/aura/env.h"
 
 namespace mojo {
 namespace services {
 namespace view_manager {
 namespace {
 
 // Id for the root node.
 const TransportConnectionSpecificNodeId kRootId = 1;
 
 }  // namespace
 
-RootNodeManager::Context::Context() {
-  // Pass in false as native viewport creates the PlatformEventSource.
-  aura::Env::CreateInstance(false);
-}
-
-RootNodeManager::Context::~Context() {
-}
-
 RootNodeManager::ScopedChange::ScopedChange(ViewManagerConnection* connection,
                                             RootNodeManager* root,
                                             TransportChangeId change_id)
     : root_(root) {
   root_->PrepareForChange(connection, change_id);
 }
 
 RootNodeManager::ScopedChange::~ScopedChange() {
   root_->FinishChange();
 }
 
-RootNodeManager::RootNodeManager(Shell* shell)
+RootNodeManager::RootNodeManager()
     : next_connection_id_(1),
-      root_view_manager_(shell, this),
       root_(this, NodeId(0, kRootId)) {
 }
 
 RootNodeManager::~RootNodeManager() {
-  // All the connections should have been destroyed.
-  DCHECK(connection_map_.empty());
 }
 
 TransportConnectionId RootNodeManager::GetAndAdvanceNextConnectionId() {
   const TransportConnectionId id = next_connection_id_++;
   DCHECK_LT(id, next_connection_id_);
   return id;
 }
 
 void RootNodeManager::AddConnection(ViewManagerConnection* connection) {
   DCHECK_EQ(0u, connection_map_.count(connection->id()));
@@ skipping 53 matching lines @@
                                        TransportChangeId change_id) {
   DCHECK(!change_.get());  // Should only ever have one change in flight.
   change_.reset(new Change(connection->id(), change_id));
 }
 
 void RootNodeManager::FinishChange() {
   DCHECK(change_.get());  // PrepareForChange/FinishChange should be balanced.
   change_.reset();
 }
 
+void RootNodeManager::OnCreated() {
+}
+
+void RootNodeManager::OnDestroyed() {
+}
+
+void RootNodeManager::OnBoundsChanged(const Rect& bounds) {
+}
+
+void RootNodeManager::OnEvent(const Event& event,
+                              const mojo::Callback<void()>& callback) {
+  callback.Run();
+}
+
 void RootNodeManager::OnNodeHierarchyChanged(const NodeId& node,
                                              const NodeId& new_parent,
                                              const NodeId& old_parent) {
-  if (!root_view_manager_.in_setup())
-    NotifyNodeHierarchyChanged(node, new_parent, old_parent);
+  NotifyNodeHierarchyChanged(node, new_parent, old_parent);
 }
 
 void RootNodeManager::OnNodeViewReplaced(const NodeId& node,
                                          const ViewId& new_view_id,
                                          const ViewId& old_view_id) {
   NotifyNodeViewReplaced(node, new_view_id, old_view_id);
 }
 
 }  // namespace view_manager
 }  // namespace services
 }  // namespace mojo