Clean-up of the app modal dialog queue

chrome/browser/jsmessage_box_handler.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/jsmessage_box_handler.h"
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "build/build_config.h"
@@ skipping 50 matching lines @@
 }
 
 void RunJavascriptMessageBox(TabContents* tab_contents,
                              const GURL& frame_url,
                              int dialog_flags,
                              const std::wstring& message_text,
                              const std::wstring& default_prompt_text,
                              bool display_suppress_checkbox,
                              IPC::Message* reply_msg) {
   std::wstring title = GetWindowTitle(tab_contents, frame_url, dialog_flags);
-  AppModalDialogQueue::AddDialog(new AppModalDialog(tab_contents, title,
-      dialog_flags, MakeTextSafe(message_text), default_prompt_text,
-      display_suppress_checkbox, false, reply_msg));
+  Singleton<AppModalDialogQueue>()->AddDialog(
+      new AppModalDialog(tab_contents, title,
+                         dialog_flags, MakeTextSafe(message_text),
+                         default_prompt_text, display_suppress_checkbox,
+                         false, reply_msg));
 }
 
 void RunBeforeUnloadDialog(TabContents* tab_contents,
                            const std::wstring& message_text,
                            IPC::Message* reply_msg) {
   std::wstring full_message =
       message_text + L"\n\n" +
       l10n_util::GetString(IDS_BEFOREUNLOAD_MESSAGEBOX_FOOTER);
-  AppModalDialogQueue::AddDialog(new AppModalDialog(
+  Singleton<AppModalDialogQueue>()->AddDialog(new AppModalDialog(
       tab_contents, l10n_util::GetString(IDS_BEFOREUNLOAD_MESSAGEBOX_TITLE),
       MessageBoxFlags::kIsJavascriptConfirm, MakeTextSafe(message_text),
       std::wstring(), false, true, reply_msg));
 }