Attempt at fixing crash in menus shown from infobars. Here's what the

chrome/browser/ui/views/infobars/infobar_view.cc

 // Copyright (c) 2011 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 "chrome/browser/ui/views/infobars/infobar_view.h"
 
 #include <algorithm>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
 #include "chrome/browser/ui/views/infobars/infobar_button_border.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/image/image.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
+#include "views/controls/menu/menu_model_adapter.h"
+#include "views/controls/menu/menu_runner.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/widget/widget.h"
 #include "views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "ui/base/win/hwnd_util.h"
@@ skipping 243 matching lines @@
 int InfoBarView::EndX() const {
   const int kCloseButtonSpacing = 12;
   return close_button_->x() - kCloseButtonSpacing;
 }
 
 const InfoBarContainer::Delegate* InfoBarView::container_delegate() const {
   const InfoBarContainer* infobar_container = container();
   return infobar_container ? infobar_container->delegate() : NULL;
 }
 
+void InfoBarView::RunMenuAt(ui::MenuModel* menu_model,
+                            views::MenuButton* button,
+                            views::MenuItemView::AnchorPosition anchor) {
+  views::MenuModelAdapter adapter(menu_model);
+  gfx::Point screen_point;
+  views::View::ConvertPointToScreen(button, &screen_point);
+  menu_runner_.reset(new views::MenuRunner(adapter.CreateMenu()));
+  // Ignore the result as we know we can only get here after the menu has
+  // closed.

[Peter Kasting, 2011/09/19 19:08:14]

Nit: This comment is a bit confusing, partly because "here" seemingly doesn't
mean "where the comment is" but rather "after the call returns".

+  ignore_result(menu_runner_->RunMenuAt(
+      GetWidget(), button, gfx::Rect(screen_point, button->size()), anchor,
+      views::MenuRunner::HAS_MNEMONICS));
+  // TODO(pkasting): this may be deleted after rewrite. Update comment after
+  // rewrite as necessary.
+}
+
 void InfoBarView::PlatformSpecificShow(bool animate) {
   views::Widget* widget = GetWidget();
   views::FocusManager* focus_manager = GetFocusManager();
 #if defined(OS_WIN)
   // If we gain focus, we want to restore it to the previously-focused element
   // when we're hidden.  So when we're in a Widget, create a focus tracker so
   // that if we gain focus we'll know what the previously-focused element was.
   if (widget) {
     focus_tracker_.reset(
         new views::ExternalFocusTracker(this, focus_manager));
   }
 #endif
   if (focus_manager)
     focus_manager->AddFocusChangeListener(this);
   if (widget) {
     widget->NotifyAccessibilityEvent(
         this, ui::AccessibilityTypes::EVENT_ALERT, true);
   }
 }
 
 void InfoBarView::PlatformSpecificHide(bool animate) {
+  // We're being removed. Cancel any menus we may have open.  Because we are
+  // deleted after a delay and after our delegate is deleted we have to
+  // explicitly cancel the menu rather than relying on the destructor to cancel
+  // the menu.
+  menu_runner_.reset();
+
   // It's possible to be called twice (once with |animate| true and once with it
   // false); in this case the second RemoveFocusChangeListener() call will
   // silently no-op.
   views::FocusManager* focus_manager = GetFocusManager();
   if (focus_manager)
     focus_manager->RemoveFocusChangeListener(this);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   if (!animate || !focus_tracker_.get())
     return;
@@ skipping 28 matching lines @@
 
 void InfoBarView::FocusWillChange(View* focused_before, View* focused_now) {
   // This will trigger some screen readers to read the entire contents of this
   // infobar.
   if (focused_before && focused_now && !Contains(focused_before) &&
       Contains(focused_now) && GetWidget()) {
     GetWidget()->NotifyAccessibilityEvent(
         this, ui::AccessibilityTypes::EVENT_ALERT, true);
   }
 }