Refactor AppModalDialogQueue and move JS Alert boxes into a MVC.

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 "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/app/chrome_dll_resource.h"
+#include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/automation/url_request_failed_dns_job.h"
 #include "chrome/browser/automation/url_request_mock_http_job.h"
 #include "chrome/browser/automation/url_request_slow_download_job.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/find_notification_details.h"
@@ skipping 14 matching lines @@
 // TODO(port): Port these headers.
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/external_tab_container.h"
 #include "chrome/browser/login_prompt.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/location_bar_view.h"
-#include "chrome/views/window/app_modal_dialog_delegate.h"
+#include "chrome/views/window/dialog_delegate.h"
 #include "chrome/views/window/window.h"
 #endif  // defined(OS_WIN)
 
 using base::Time;
 
 class InitialLoadObserver : public NotificationObserver {
  public:
   InitialLoadObserver(size_t tab_count, AutomationProvider* automation)
       : automation_(automation),
         outstanding_tab_count_(tab_count) {
@@ skipping 1163 matching lines @@
 }
 
 void AutomationProvider::GetBrowserWindowCount(int* window_count) {
   *window_count = static_cast<int>(BrowserList::size());
 }
 
 #if defined(OS_WIN)
 // TODO(port): Enable when dialog delegate is ported.
 void AutomationProvider::GetShowingAppModalDialog(bool* showing_dialog,
                                                   int* dialog_button) {
-  views::AppModalDialogDelegate* dialog_delegate =
-      AppModalDialogQueue::active_dialog();
+  AppModalDialog* dialog_delegate = AppModalDialogQueue::active_dialog();
   *showing_dialog = (dialog_delegate != NULL);
   if (*showing_dialog)
     *dialog_button = dialog_delegate->GetDialogButtons();
   else
     *dialog_button = views::DialogDelegate::DIALOGBUTTON_NONE;
 }
 
 void AutomationProvider::ClickAppModalDialogButton(int button, bool* success) {
   *success = false;
 
-  views::AppModalDialogDelegate* dialog_delegate =
-      AppModalDialogQueue::active_dialog();
+  AppModalDialog* dialog_delegate = AppModalDialogQueue::active_dialog();
   if (dialog_delegate &&
       (dialog_delegate->GetDialogButtons() & button) == button) {
-    views::DialogClientView* client_view =
-        dialog_delegate->window()->GetClientView()->AsDialogClientView();
     if ((button & views::DialogDelegate::DIALOGBUTTON_OK) ==
         views::DialogDelegate::DIALOGBUTTON_OK) {
-      client_view->AcceptWindow();
+      dialog_delegate->AcceptWindow();
       *success =  true;
     }
     if ((button & views::DialogDelegate::DIALOGBUTTON_CANCEL) ==
         views::DialogDelegate::DIALOGBUTTON_CANCEL) {
       DCHECK(!*success) << "invalid param, OK and CANCEL specified";
-      client_view->CancelWindow();
+      dialog_delegate->CancelWindow();
       *success =  true;
     }
   }
 }
 #endif
 
 void AutomationProvider::GetBrowserWindow(int index, int* handle) {
   *handle = 0;
   if (index >= 0) {
     BrowserList::const_iterator iter = BrowserList::begin();
@@ skipping 1509 matching lines @@
       if (!SetParent(params.window, params.parent_window))
         DLOG(WARNING) << "SetParent failed. Error 0x%x" << GetLastError();
     }
   }
 
   SetWindowPos(params.window, params.window_insert_after, params.left,
                params.top, params.width, params.height, params.flags);
 }
 
 #endif  // defined(OS_WIN)