Fixes possible crash if the window hosting a menu was closed while the

views/controls/menu/submenu_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/controls/menu/submenu_view.h"
 
 #include "gfx/canvas.h"
 #include "views/controls/menu/menu_controller.h"
+#include "views/controls/menu/menu_host.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/widget/root_view.h"
 
-#if defined(OS_WIN)
-#include "views/controls/menu/menu_host_win.h"
-#elif defined(OS_LINUX)
-#include "views/controls/menu/menu_host_gtk.h"
-#endif
-
 // Height of the drop indicator. This should be an even number.
 static const int kDropIndicatorHeight = 2;
 
 // Color of the drop indicator.
 static const SkColor kDropIndicatorColor = SK_ColorBLACK;
 
 namespace views {
 
 // static
 const int SubmenuView::kSubmenuBorderSize = 3;
@@ skipping 173 matching lines @@
     }
     ScrollRectToVisible(gfx::Rect(gfx::Point(0, scroll_target),
                                   vis_bounds.size()));
     vis_bounds = GetVisibleBounds();
   }
 
   return true;
 }
 
 bool SubmenuView::IsShowing() {
-  return host_ && host_->IsVisible();
+  return host_ && host_->IsMenuHostVisible();
 }
 
 void SubmenuView::ShowAt(gfx::NativeWindow parent,
                          const gfx::Rect& bounds,
                          bool do_capture) {
   if (host_) {
-    host_->Show();
-    if (do_capture)
-      host_->DoCapture();
+    host_->ShowMenuHost(do_capture);
     return;
   }
 
-  host_ = new MenuHost(this);
+  host_ = MenuHost::Create(this);
   // Force construction of the scroll view container.
   GetScrollViewContainer();
   // Make sure the first row is visible.
   ScrollRectToVisible(gfx::Rect(gfx::Point(), gfx::Size(1, 1)));
   host_->Init(parent, bounds, scroll_view_container_, do_capture);
 }
 
 void SubmenuView::Reposition(const gfx::Rect& bounds) {
-  host_->SetBounds(bounds);
+  if (host_)
+    host_->SetMenuHostBounds(bounds);
 }
 
 void SubmenuView::Close() {
   if (host_) {
-    host_->Close();
+    host_->DestroyMenuHost();
     host_ = NULL;
   }
 }
 
 void SubmenuView::Hide() {
   if (host_)
-    host_->HideWindow();
+    host_->HideMenuHost();
 }
 
 void SubmenuView::ReleaseCapture() {
-  host_->ReleaseCapture();
+  if (host_)
+    host_->ReleaseMenuHostCapture();
 }
 
 bool SubmenuView::SkipDefaultKeyEventProcessing(const views::KeyEvent& e) {
   return views::FocusManager::IsTabTraversalKeyEvent(e);
 }
 
 void SubmenuView::SetDropMenuItem(MenuItemView* item,
                                   MenuDelegate::DropPosition position) {
   if (drop_item_ == item && drop_position_ == position)
     return;
@@ skipping 15 matching lines @@
 MenuScrollViewContainer* SubmenuView::GetScrollViewContainer() {
   if (!scroll_view_container_) {
     scroll_view_container_ = new MenuScrollViewContainer(this);
     // Otherwise MenuHost would delete us.
     scroll_view_container_->set_parent_owned(false);
   }
   return scroll_view_container_;
 }
 
 gfx::NativeWindow SubmenuView::native_window() const {
-  return host_ ? host_->GetNativeWindow() : NULL;
+  return host_ ? host_->GetMenuHostWindow() : NULL;
+}
+
+void SubmenuView::MenuHostDestroyed() {
+  host_ = NULL;
+  GetMenuItem()->GetMenuController()->Cancel(MenuController::EXIT_DESTROYED);
 }
 
 void SubmenuView::PaintDropIndicator(gfx::Canvas* canvas,
                                      MenuItemView* item,
                                      MenuDelegate::DropPosition position) {
   if (position == MenuDelegate::DROP_NONE)
     return;
 
   gfx::Rect bounds = CalculateDropIndicatorBounds(item, position);
   canvas->FillRectInt(kDropIndicatorColor, bounds.x(), bounds.y(),
@@ skipping 29 matching lines @@
       item_bounds.set_height(kDropIndicatorHeight);
       return item_bounds;
 
     default:
       // Don't render anything for on.
       return gfx::Rect();
   }
 }
 
 }  // namespace views