| Index: mojo/services/view_manager/root_node_manager.cc
|
| diff --git a/mojo/services/view_manager/root_node_manager.cc b/mojo/services/view_manager/root_node_manager.cc
|
| index 529306de24cee67b67cfa6e3b116f4bec0abd06a..1a17ebd34ad85d3577e23995d8467de487db3b16 100644
|
| --- a/mojo/services/view_manager/root_node_manager.cc
|
| +++ b/mojo/services/view_manager/root_node_manager.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/logging.h"
|
| #include "mojo/services/view_manager/view_manager_connection.h"
|
| -#include "ui/aura/env.h"
|
|
|
| namespace mojo {
|
| namespace services {
|
| @@ -17,14 +16,6 @@
|
| 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,
|
| @@ -37,15 +28,12 @@
|
| 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() {
|
| @@ -119,11 +107,24 @@
|
| 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,
|
|
|