Clean-up of the app modal dialog queue

chrome/browser/app_modal_dialog.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/app_modal_dialog.h"
 
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/ipc_message.h"
 
 AppModalDialog::AppModalDialog(TabContents* tab_contents,
                                const std::wstring& title,
                                int dialog_flags,
                                const std::wstring& message_text,
                                const std::wstring& default_prompt_text,
                                bool display_suppress_checkbox,
                                bool is_before_unload_dialog,
                                IPC::Message* reply_msg)
-    : tab_contents_(tab_contents),
+    : dialog_(NULL),
+      tab_contents_(tab_contents),
       title_(title),
       dialog_flags_(dialog_flags),
       message_text_(message_text),
       default_prompt_text_(default_prompt_text),
       display_suppress_checkbox_(display_suppress_checkbox),
       is_before_unload_dialog_(is_before_unload_dialog),
       reply_msg_(reply_msg) {
   InitNotifications();
 }
 
@@ skipping 23 matching lines @@
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
                  NotificationService::AllSources());
 }
 
 void AppModalDialog::ShowModalDialog() {
   // If the TabContents that created this dialog navigated away before this
   // dialog became visible, simply show the next dialog if any.
   if (!tab_contents_) {
-    AppModalDialogQueue::ShowNextDialog();
+    Singleton<AppModalDialogQueue>()->ShowNextDialog();
     delete this;
     return;
   }
 
   tab_contents_->Activate();
   CreateAndShowDialog();
 }
 
 void AppModalDialog::OnCancel() {
   // We need to do this before WM_DESTROY (WindowClosing()) as any parent frame
   // will receive it's activation messages before this dialog receives
   // WM_DESTROY. The parent frame would then try to activate any modal dialogs
   // that were still open in the ModalDialogQueue, which would send activation
   // back to this one. The framework should be improved to handle this, so this
   // is a temporary workaround.
-  AppModalDialogQueue::ShowNextDialog();
+  Singleton<AppModalDialogQueue>()->ShowNextDialog();
 
   if (tab_contents_) {
     tab_contents_->OnJavaScriptMessageBoxClosed(reply_msg_, false,
                                                 std::wstring());
   }
 }
 
 void AppModalDialog::OnAccept(const std::wstring& prompt_text,
                               bool suppress_js_messages) {
-  AppModalDialogQueue::ShowNextDialog();
+  Singleton<AppModalDialogQueue>()->ShowNextDialog();
 
   if (tab_contents_) {
     tab_contents_->OnJavaScriptMessageBoxClosed(reply_msg_, true,
                                                 prompt_text);
 
     if (suppress_js_messages)
       tab_contents()->set_suppress_javascript_messages(true);
   }
 }
 
 void AppModalDialog::OnClose() {
  if (tab_contents_) {
    tab_contents_->OnJavaScriptMessageBoxWindowDestroyed();
  }
 }