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

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

Index: chrome/browser/ui/views/infobars/before_translate_infobar.cc
===================================================================
--- chrome/browser/ui/views/infobars/before_translate_infobar.cc	(revision 102374)
+++ chrome/browser/ui/views/infobars/before_translate_infobar.cc	(working copy)
@@ -11,9 +11,6 @@
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_item_view.h"
-#include "views/controls/menu/menu_model_adapter.h"
-#include "views/controls/menu/menu_runner.h"
-#include "views/widget/widget.h"
 
 BeforeTranslateInfoBar::BeforeTranslateInfoBar(
     TabContentsWrapper* owner,
@@ -190,17 +187,17 @@
 
 void BeforeTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) {
   ui::MenuModel* menu_model = NULL;
+  views::MenuButton* button = NULL;
+  views::MenuItemView::AnchorPosition anchor = views::MenuItemView::TOPLEFT;
   if (source == language_menu_button_) {
     menu_model = &languages_menu_model_;
+    button = language_menu_button_;
   } else {
     DCHECK_EQ(options_menu_button_, source);
     menu_model = &options_menu_model_;
+    button = options_menu_button_;
+    anchor = views::MenuItemView::TOPRIGHT;
   }
-
-  views::MenuModelAdapter menu_model_adapter(menu_model);
-  menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
-  if (menu_runner_->RunMenuAt(source->GetWidget(), NULL,
-          gfx::Rect(pt, gfx::Size()), views::MenuItemView::TOPRIGHT,
-          views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
-    return;
+  RunMenuAt(menu_model, button, anchor);
+  // TODO(pkasting): this may be deleted after rewrite.
 }