chrome/browser/ui/app_modal_dialogs/app_modal_dialog.cc - Issue 10928004: Merge 152716 - Fix a Windows crash bug with javascript alerts from extension popups.

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/app_modal_dialogs/app_modal_dialog.cc

Issue 10928004: Merge 152716 - Fix a Windows crash bug with javascript alerts from extension popups. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1229/src/

Patch Set: Created 8 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/app_modal_dialogs/app_modal_dialog.cc

===================================================================

--- chrome/browser/ui/app_modal_dialogs/app_modal_dialog.cc (revision 155001)

+++ chrome/browser/ui/app_modal_dialogs/app_modal_dialog.cc (working copy)

@@ -18,10 +18,12 @@

: valid_(true),

native_dialog_(NULL),

title_(title),

- web_contents_(web_contents) {

+ web_contents_(web_contents),

+ completed_(false) {

}

AppModalDialog::~AppModalDialog() {

+ CompleteDialog();

}

void AppModalDialog::ShowModalDialog() {

@@ -62,5 +64,8 @@

}

void AppModalDialog::CompleteDialog() {

- AppModalDialogQueue::GetInstance()->ShowNextDialog();

+ if (!completed_) {

+ completed_ = true;

+ AppModalDialogQueue::GetInstance()->ShowNextDialog();

+ }

}

« no previous file with comments | « chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h ('k') | no next file » | no next file with comments »