Delay deletion of view in View::DoRemoveChildView

views/view.cc

 // Copyright (c) 2010 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 "views/view.h"
 
 #include <algorithm>
 #ifndef NDEBUG
 #include <iostream>
 #endif
 
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/path.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "views/background.h"
 #include "views/layout_manager.h"
 #include "views/views_delegate.h"
 #include "views/widget/root_view.h"
 #include "views/widget/tooltip_manager.h"
@@ skipping 600 matching lines @@
                              bool delete_removed_view) {
 #ifndef NDEBUG
   DCHECK(!IsProcessingPaint()) << "Should not be removing a child view " <<
                                   "during a paint, this will seriously " <<
                                   "mess things up!";
 #endif
   DCHECK(a_view);
   const ViewList::iterator i =  find(child_views_.begin(),
                                      child_views_.end(),
                                      a_view);
+  scoped_ptr<View> view_to_be_deleted;
   if (i != child_views_.end()) {
     if (update_focus_cycle) {
       // Let's remove the view from the focus traversal.
       View* next_focusable = a_view->next_focusable_view_;
       View* prev_focusable = a_view->previous_focusable_view_;
       if (prev_focusable)
         prev_focusable->next_focusable_view_ = next_focusable;
       if (next_focusable)
         next_focusable->previous_focusable_view_ = prev_focusable;
     }
 
     RootView* root = GetRootView();
     if (root)
       UnregisterChildrenForVisibleBoundsNotification(root, a_view);
     a_view->PropagateRemoveNotifications(this);
     a_view->SetParent(NULL);
 
     if (delete_removed_view && a_view->IsParentOwned())
-      delete a_view;
+      view_to_be_deleted.reset(a_view);
 
     child_views_.erase(i);
   }
 
   if (update_tool_tip)
     UpdateTooltip();
 
   if (layout_manager_.get())
     layout_manager_->ViewRemoved(this, a_view);
 }
@@ skipping 867 matching lines @@
   possible_drag = false;
   start_pt = gfx::Point();
 }
 
 void View::DragInfo::PossibleDrag(const gfx::Point& p) {
   possible_drag = true;
   start_pt = p;
 }
 
 }  // namespace