Shutdown cleanup

mojo/services/public/cpp/view_manager/lib/node.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/public/cpp/view_manager/node.h"
 
 #include "mojo/services/public/cpp/view_manager/lib/node_private.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
 #include "mojo/services/public/cpp/view_manager/node_observer.h"
@@ skipping 176 matching lines @@
   }
 
  private:
   Node* node_;
   const gfx::Rect old_bounds_;
   const gfx::Rect new_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedSetBoundsNotifier);
 };
 
-class ScopedDestructionNotifier {
- public:
-  explicit ScopedDestructionNotifier(Node* node)
-      : node_(node) {
-    FOR_EACH_OBSERVER(NodeObserver,
-                      *NodePrivate(node_).observers(),
-                      OnNodeDestroying(node_));
-  }
-  ~ScopedDestructionNotifier() {
-    FOR_EACH_OBSERVER(NodeObserver,
-                      *NodePrivate(node_).observers(),
-                      OnNodeDestroyed(node_));
-  }
-
- private:
-  Node* node_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedDestructionNotifier);
-};
-
 // Some operations are only permitted in the connection that created the node.
 bool OwnsNode(ViewManager* manager, Node* node) {
   return !manager ||
       static_cast<ViewManagerClientImpl*>(manager)->OwnsNode(node->id());
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Node, public:
@@ skipping 125 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Node, protected:
 
 Node::Node()
     : manager_(NULL),
       id_(static_cast<Id>(-1)),
       parent_(NULL),
       active_view_(NULL) {}
 
 Node::~Node() {
-  ScopedDestructionNotifier notifier(this);
+  FOR_EACH_OBSERVER(NodeObserver, observers_, OnNodeDestroying(this));
   if (parent_)
     parent_->LocalRemoveChild(this);
   // TODO(beng): It'd be better to do this via a destruction observer in the
   //             ViewManagerClientImpl.
   if (manager_)
     static_cast<ViewManagerClientImpl*>(manager_)->RemoveNode(id_);
+  FOR_EACH_OBSERVER(NodeObserver, observers_, OnNodeDestroyed(this));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Node, private:
 
 Node::Node(ViewManager* manager)
     : manager_(manager),
       id_(static_cast<ViewManagerClientImpl*>(manager_)->CreateNode()),
       parent_(NULL),
       active_view_(NULL) {}
@@ skipping 31 matching lines @@
 
 void Node::LocalSetBounds(const gfx::Rect& old_bounds,
                           const gfx::Rect& new_bounds) {
   DCHECK(old_bounds == bounds_);
   ScopedSetBoundsNotifier notifier(this, old_bounds, new_bounds);
   bounds_ = new_bounds;
 }
 
 }  // namespace view_manager
 }  // namespace mojo