chrome/browser/ui/views/infobars/infobar_view.cc - Issue 7796010: Attempt at fixing crash in menus shown from infobars. Here's what the

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/infobars/infobar_view.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: 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:

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

diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc

index 8faa905a9dfc4a60100ab33d6db12678f2ab148e..2da2235aadcd039838704ae9504b22ddc31596a2 100644

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

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

@@ -210,7 +210,10 @@ void InfoBarView::Layout() {

void InfoBarView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {

View::ViewHierarchyChanged(is_add, parent, child);

- if (is_add && (child == this) && (close_button_ == NULL)) {

+ if (!is_add && (child == this)) {

+ // We're being removed. Cancel any menus we may have open.

Peter Kasting 2011/09/12 18:06:00 Do this at the top of PlatformSpecificHide() inste

+ CancelMenu();

+ } else if (is_add && (child == this) && (close_button_ == NULL)) {

gfx::Image* image = delegate()->GetIcon();

if (image) {

icon_ = new views::ImageView;