Index: chrome/browser/js_modal_dialog.cc |
diff --git a/chrome/browser/js_modal_dialog.cc b/chrome/browser/js_modal_dialog.cc |
index 37253b93b1e09ea8d698269759f90647546b64dc..111aa01af5c640a79ff157058d6f11a1f14e0516 100644 |
--- a/chrome/browser/js_modal_dialog.cc |
+++ b/chrome/browser/js_modal_dialog.cc |
@@ -29,6 +29,9 @@ JavaScriptAppModalDialog::JavaScriptAppModalDialog( |
bool is_before_unload_dialog, |
IPC::Message* reply_msg) |
: AppModalDialog(client->AsTabContents(), title), |
+#if defined(OS_MACOSX) |
+ dialog_(NULL), |
+#endif |
client_(client), |
extension_host_(client->AsExtensionHost()), |
dialog_flags_(dialog_flags), |
@@ -64,7 +67,8 @@ void JavaScriptAppModalDialog::Observe(NotificationType type, |
// Also clear the client, since it's now invalid. |
skip_this_dialog_ = true; |
client_ = NULL; |
- CloseModalDialog(); |
+ if (dialog_) |
+ CloseModalDialog(); |
} |
void JavaScriptAppModalDialog::InitNotifications() { |
@@ -136,4 +140,3 @@ void JavaScriptAppModalDialog::Cleanup() { |
} |
AppModalDialog::Cleanup(); |
} |
- |