Shutdown cleanup

mojo/services/public/cpp/view_manager/lib/view.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/view.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.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
 #include "ui/gfx/canvas.h"
 
 namespace mojo {
 namespace view_manager {
 
-namespace {
-class ScopedDestructionNotifier {
- public:
-  explicit ScopedDestructionNotifier(View* view)
-      : view_(view) {
-    FOR_EACH_OBSERVER(ViewObserver,
-                      *ViewPrivate(view_).observers(),
-                      OnViewDestroying(view_));
-  }
-  ~ScopedDestructionNotifier() {
-    FOR_EACH_OBSERVER(ViewObserver,
-                      *ViewPrivate(view_).observers(),
-                      OnViewDestroyed(view_));
-  }
-
- private:
-  View* view_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedDestructionNotifier);
-};
-}  // namespace
-
 // static
 View* View::Create(ViewManager* manager) {
   View* view = new View(manager);
   static_cast<ViewManagerClientImpl*>(manager)->AddView(view);
   return view;
 }
 
 void View::Destroy() {
   if (manager_)
     static_cast<ViewManagerClientImpl*>(manager_)->DestroyView(id_);
@@ skipping 25 matching lines @@
     : id_(static_cast<ViewManagerClientImpl*>(manager)->CreateView()),
       node_(NULL),
       manager_(manager) {}
 
 View::View()
     : id_(static_cast<Id>(-1)),
       node_(NULL),
       manager_(NULL) {}
 
 View::~View() {
-  ScopedDestructionNotifier notifier(this);
+  FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDestroying(this));
   // TODO(beng): It'd be better to do this via a destruction observer in the
   //             ViewManagerClientImpl.
   if (manager_)
     static_cast<ViewManagerClientImpl*>(manager_)->RemoveView(id_);
+
+  FOR_EACH_OBSERVER(ViewObserver, observers_, OnViewDestroyed(this));
 }
 
 void View::LocalDestroy() {
   delete this;
 }
 
 }  // namespace view_manager
 }  // namespace mojo