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

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

Issue 311373005: Nesting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 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: mojo/services/public/cpp/view_manager/lib/view_manager_private.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_private.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_private.cc
index 0d1457538df07ac287575c1b16fa1eae7fcf8b40..ae8d4efcdc3b22d5226abf2162205fc31c3941b1 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_private.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_private.cc
@@ -5,6 +5,7 @@
#include "mojo/services/public/cpp/view_manager/lib/view_manager_private.h"
#include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
+#include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
#include "mojo/services/public/cpp/view_manager/view_tree_node_observer.h"
namespace mojo {
@@ -50,8 +51,7 @@ void ViewManagerPrivate::AddRoot(ViewTreeNode* root) {
}
manager_->roots_.push_back(root);
root->AddObserver(new RootObserver(root));
- if (!manager_->root_added_callback_.is_null())
- manager_->root_added_callback_.Run(manager_, root);
+ manager_->delegate_->OnRootAdded(manager_, root);
}
void ViewManagerPrivate::RemoveRoot(ViewTreeNode* root) {
@@ -59,8 +59,7 @@ void ViewManagerPrivate::RemoveRoot(ViewTreeNode* root) {
std::find(manager_->roots_.begin(), manager_->roots_.end(), root);
if (it != manager_->roots_.end()) {
manager_->roots_.erase(it);
- if (!manager_->root_removed_callback_.is_null())
- manager_->root_removed_callback_.Run(manager_, root);
+ manager_->delegate_->OnRootRemoved(manager_, root);
}
}

Powered by Google App Engine
This is Rietveld 408576698