AppModalDialogQueue shouldn't depend on views.

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2006-2008 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/thread.h"
 #include "chrome/app/chrome_dll_resource.h" 
+#include "chrome/browser/app_modal_dialog_delegate.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/automation/ui_controls.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/character_encoding.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/external_tab_container.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/login_prompt.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/views/app_modal_dialog_delegate.h"
+#include "chrome/views/dialog_delegate.h"
 #include "chrome/views/window.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_filter.h"
 
 using base::Time;
 
 class InitialLoadObserver : public NotificationObserver {
  public:
@@ skipping 1108 matching lines @@
     *active_tab_index = browser->selected_index();
   }
 }
 
 void AutomationProvider::GetBrowserWindowCount(int* window_count) {
   *window_count = static_cast<int>(BrowserList::size());
 }
 
 void AutomationProvider::GetShowingAppModalDialog(bool* showing_dialog,
                                                   int* dialog_button) {
-  views::AppModalDialogDelegate* 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;
+  *showing_dialog = AppModalDialogQueue::HasActiveDialog();
+  *dialog_button = views::DialogDelegate::DIALOGBUTTON_NONE;
+  if (!*showing_dialog)
+    return;
+
+  views::DialogDelegate* dialog_delegate =
+      AppModalDialogQueue::active_dialog()->GetTestingInterface()->
+          GetDialogDelegate();
+  *dialog_button = dialog_delegate->GetDialogButtons();
 }
 
 void AutomationProvider::ClickAppModalDialogButton(int button, bool* success) {
   *success = false;
+  if (!AppModalDialogQueue::HasActiveDialog())
+    return;
 
-  views::AppModalDialogDelegate* dialog_delegate =
-      AppModalDialogQueue::active_dialog();
-  if (dialog_delegate &&
-      (dialog_delegate->GetDialogButtons() & button) == button) {
+  views::DialogDelegate* dialog_delegate =
+      AppModalDialogQueue::active_dialog()->GetTestingInterface()->
+          GetDialogDelegate();
+  if ((dialog_delegate->GetDialogButtons() & button) == button) {
     views::DialogClientView* client_view =
         dialog_delegate->window()->client_view()->AsDialogClientView();
     if ((button & views::DialogDelegate::DIALOGBUTTON_OK) ==
         views::DialogDelegate::DIALOGBUTTON_OK) {
       client_view->AcceptWindow();
       *success =  true;
     }
     if ((button & views::DialogDelegate::DIALOGBUTTON_CANCEL) ==
         views::DialogDelegate::DIALOGBUTTON_CANCEL) {
       DCHECK(!*success) << "invalid param, OK and CANCEL specified";
@@ skipping 1401 matching lines @@
         browser->OverrideEncoding(selected_encoding_id);
         *success = true;
       }
     }
   }
 }
 
 void AutomationProvider::SavePackageShouldPromptUser(bool should_prompt) {
   SavePackage::SetShouldPromptUser(should_prompt);
 }