Turn Bookmark Menus Async

ui/views/controls/menu/menu_host.cc

 // Copyright (c) 2012 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 "ui/views/controls/menu/menu_host.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
@@ skipping 201 matching lines @@
 }
 
 void MenuHost::OnDragWillStart() {
   MenuController* menu_controller =
       submenu_->GetMenuItem()->GetMenuController();
   DCHECK(menu_controller);
   menu_controller->OnDragWillStart();
 }
 
 void MenuHost::OnDragComplete() {
+  // If we are being destroyed there is no guarantee that the menu items are
+  // available.
+  if (destroying_)
+    return;
   MenuController* menu_controller =
       submenu_->GetMenuItem()->GetMenuController();
-  if (destroying_ || !menu_controller)
+  if (!menu_controller)
     return;
 
   bool should_close = true;
   // If the view came from outside menu code (i.e., not a MenuItemView), we
   // should consult the MenuDelegate to determine whether or not to close on
   // exit.
   if (!menu_controller->did_initiate_drag()) {
     MenuDelegate* menu_delegate = submenu_->GetMenuItem()->GetDelegate();
     should_close =
       menu_delegate ? menu_delegate->ShouldCloseOnDragComplete() : should_close;
   }
   menu_controller->OnDragComplete(should_close);
 
   // We may have lost capture in the drag and drop, but are remaining open.
   // Return capture so we get MouseCaptureLost events.
   if (!should_close)
     native_widget_private()->SetCapture();
 }
 
 }  // namespace views