diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 19:14:05 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 19:14:05 +0000 |
| commit | 85ce4a10572fe194b067ccba37966a6e3983abdf (patch) | |
| tree | ae253d2d32ee6d0bf0d482fe357f1af4e8c69f07 /chrome | |
| parent | f5836708c52d459568194f30c7c5a75278d96229 (diff) | |
| download | chromium_src-85ce4a10572fe194b067ccba37966a6e3983abdf.zip chromium_src-85ce4a10572fe194b067ccba37966a6e3983abdf.tar.gz chromium_src-85ce4a10572fe194b067ccba37966a6e3983abdf.tar.bz2 | |
Potential fix for reliability test crash.
BUG=34971
TEST=run reliabilty tests
Review URL: http://codereview.chromium.org/588001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/jsmessage_box_dialog.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/views/modal_dialog_delegate.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/views/jsmessage_box_dialog.cc b/chrome/browser/views/jsmessage_box_dialog.cc index 9e78f1d..269dde7 100644 --- a/chrome/browser/views/jsmessage_box_dialog.cc +++ b/chrome/browser/views/jsmessage_box_dialog.cc @@ -59,7 +59,6 @@ std::wstring JavaScriptMessageBoxDialog::GetWindowTitle() const { void JavaScriptMessageBoxDialog::WindowClosing() { - dialog_ = NULL; } void JavaScriptMessageBoxDialog::DeleteDelegate() { diff --git a/chrome/browser/views/modal_dialog_delegate.cc b/chrome/browser/views/modal_dialog_delegate.cc index 586b9f6..a0f91ba 100644 --- a/chrome/browser/views/modal_dialog_delegate.cc +++ b/chrome/browser/views/modal_dialog_delegate.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/modal_dialog_delegate.h" +#include "base/logging.h" #include "views/window/window.h" void ModalDialogDelegate::ShowModalDialog() { @@ -19,6 +20,7 @@ void ModalDialogDelegate::ShowModalDialog() { } void ModalDialogDelegate::ActivateModalDialog() { + DCHECK(dialog_); // Ensure that the dialog is visible and at the top of the z-order. These // conditions may not be true if the dialog was opened on a different virtual // desktop to the one the browser window is on. |