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

Unified Diff: mojo/examples/embedded_app/embedded_app.cc

Issue 374933003: Remove DispositionChangePhase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « mojo/aura/window_tree_host_mojo.cc ('k') | mojo/examples/nesting_app/nesting_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/examples/embedded_app/embedded_app.cc
diff --git a/mojo/examples/embedded_app/embedded_app.cc b/mojo/examples/embedded_app/embedded_app.cc
index 5f20c5d03483b94a513444098c0ef02ada44a3fd..7ee4777f79dd85d44f494d76d3503524c85472b7 100644
--- a/mojo/examples/embedded_app/embedded_app.cc
+++ b/mojo/examples/embedded_app/embedded_app.cc
@@ -113,19 +113,13 @@ class EmbeddedApp : public ApplicationDelegate,
}
// Overridden from NodeObserver:
- virtual void OnNodeActiveViewChange(
- Node* node,
- View* old_view,
- View* new_view,
- NodeObserver::DispositionChangePhase phase) OVERRIDE {
+ virtual void OnNodeActiveViewChanged(Node* node,
+ View* old_view,
+ View* new_view) OVERRIDE {
if (new_view == 0)
views_to_reap_[node] = old_view;
}
- virtual void OnNodeDestroy(
- Node* node,
- NodeObserver::DispositionChangePhase phase) OVERRIDE {
- if (phase != NodeObserver::DISPOSITION_CHANGED)
- return;
+ virtual void OnNodeDestroyed(Node* node) OVERRIDE {
DCHECK(roots_.find(node->id()) != roots_.end());
roots_.erase(node->id());
std::map<Node*, View*>::const_iterator it = views_to_reap_.find(node);
« no previous file with comments | « mojo/aura/window_tree_host_mojo.cc ('k') | mojo/examples/nesting_app/nesting_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698