Clean-up of the app modal dialog queue

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2006-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/automation/automation_provider.h"
 
 #include "app/message_box_flags.h"
 #include "base/file_version_info.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 1324 matching lines @@
   *window_count = static_cast<int>(BrowserList::size());
 }
 
 void AutomationProvider::GetNormalBrowserWindowCount(int* window_count) {
   *window_count = static_cast<int>(
       BrowserList::GetBrowserCountForType(profile_, Browser::TYPE_NORMAL));
 }
 
 void AutomationProvider::GetShowingAppModalDialog(bool* showing_dialog,
                                                   int* dialog_button) {
-  AppModalDialog* dialog_delegate = AppModalDialogQueue::active_dialog();
+  AppModalDialog* dialog_delegate =
+      Singleton<AppModalDialogQueue>()->active_dialog();
   *showing_dialog = (dialog_delegate != NULL);
   if (*showing_dialog)
     *dialog_button = dialog_delegate->GetDialogButtons();
   else
     *dialog_button = MessageBoxFlags::DIALOGBUTTON_NONE;
 }
 
 void AutomationProvider::ClickAppModalDialogButton(int button, bool* success) {
   *success = false;
 
-  AppModalDialog* dialog_delegate = AppModalDialogQueue::active_dialog();
+  AppModalDialog* dialog_delegate =
+      Singleton<AppModalDialogQueue>()->active_dialog();
   if (dialog_delegate &&
       (dialog_delegate->GetDialogButtons() & button) == button) {
     if ((button & MessageBoxFlags::DIALOGBUTTON_OK) ==
         MessageBoxFlags::DIALOGBUTTON_OK) {
       dialog_delegate->AcceptWindow();
       *success =  true;
     }
     if ((button & MessageBoxFlags::DIALOGBUTTON_CANCEL) ==
         MessageBoxFlags::DIALOGBUTTON_CANCEL) {
       DCHECK(!*success) << "invalid param, OK and CANCEL specified";
@@ skipping 1610 matching lines @@
         DLOG(WARNING) << "SetParent failed. Error 0x%x" << GetLastError();
     }
   }
 }
 #endif
 
 void AutomationProvider::GetWindowTitle(int handle, string16* text) {
   gfx::NativeWindow window = window_tracker_->GetResource(handle);
   text->assign(platform_util::GetWindowTitle(window));
 }