Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7847)

Unified Diff: chrome/browser/ui/views/infobars/extension_infobar.cc

Issue 7796010: Attempt at fixing crash in menus shown from infobars. Here's what the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ignore return value Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/infobars/extension_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index 49f02ab267a3e12134586dae718a3a3ba8984d38..f9e5fd1a03bd1cff9d03f556271cd86aa27f7bb9 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -18,8 +18,6 @@
#include "ui/gfx/canvas_skia.h"
#include "views/controls/button/menu_button.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"
// ExtensionInfoBarDelegate ----------------------------------------------------
@@ -148,14 +146,9 @@ void ExtensionInfoBar::RunMenu(View* source, const gfx::Point& pt) {
browser();
scoped_refptr<ExtensionContextMenuModel> options_menu_contents =
new ExtensionContextMenuModel(extension, browser, NULL);
- views::MenuModelAdapter options_menu_delegate(options_menu_contents.get());
- menu_runner_.reset(new views::MenuRunner(options_menu_delegate.CreateMenu()));
- gfx::Point screen_point;
- views::View::ConvertPointToScreen(menu_, &screen_point);
- if (menu_runner_->RunMenuAt(GetWidget(), menu_,
- gfx::Rect(screen_point, menu_->size()), views::MenuItemView::TOPLEFT,
- views::MenuRunner::HAS_MNEMONICS) == views::MenuRunner::MENU_DELETED)
- return;
+ DCHECK_EQ(source, menu_);
+ RunMenuAt(options_menu_contents.get(), menu_, views::MenuItemView::TOPLEFT);
+ // TODO(pkasting): this may be deleted after rewrite.
}
ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() {

Powered by Google App Engine
This is Rietveld 408576698