Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager.cc

Issue 280023002: Revert 269414 "Changes to deletion/ownership of nodes in the cli..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager.cc
===================================================================
--- trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager.cc (revision 269420)
+++ trunk/src/mojo/services/public/cpp/view_manager/lib/view_manager.cc (working copy)
@@ -5,7 +5,6 @@
#include "mojo/services/public/cpp/view_manager/view_manager.h"
#include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
-#include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
namespace mojo {
namespace services {
@@ -14,25 +13,12 @@
ViewManager::ViewManager(Shell* shell)
: shell_(shell) {}
-ViewManager::~ViewManager() {
- while (!nodes_.empty()) {
- IdToNodeMap::iterator it = nodes_.begin();
- if (synchronizer_->OwnsNode(it->second->id()))
- it->second->Destroy();
- else
- nodes_.erase(it);
- }
-}
+ViewManager::~ViewManager() {}
void ViewManager::Init() {
synchronizer_.reset(new ViewManagerSynchronizer(this));
}
-ViewTreeNode* ViewManager::GetNodeById(TransportNodeId id) {
- IdToNodeMap::const_iterator it = nodes_.find(id);
- return it != nodes_.end() ? it->second : NULL;
-}
-
} // namespace view_manager
} // namespace services
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698