AppModalDialogQueue shouldn't depend on views.

chrome/browser/jsmessage_box_handler_win.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/jsmessage_box_handler_win.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
@@ skipping 48 matching lines @@
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
                  NotificationService::AllSources());
 }
 
 JavascriptMessageBoxHandler::~JavascriptMessageBoxHandler() {
 }
 
 //////////////////////////////////////////////////////////////////////////////
+// JavascriptMessageBoxHandler, views::AppModalDialogDelegate
+//    implementation:
+
+void JavascriptMessageBoxHandler::ShowModalDialog() {
+  // If the WebContents that created this dialog navigated away before this
+  // dialog became visible, simply show the next dialog if any.
+  if (!web_contents_) {
+    AppModalDialogQueue::ShowNextDialog();
+    delete this;
+    return;
+  }
+
+  web_contents_->Activate();
+  HWND root_hwnd = GetAncestor(web_contents_->GetNativeView(), GA_ROOT);
+  dialog_ = views::Window::CreateChromeWindow(root_hwnd, gfx::Rect(), this);
+  dialog_->Show();
+}
+
+void JavascriptMessageBoxHandler::ActivateModalDialog() {
+  // Ensure that the dialog is visible and at the top of the z-order. These
+  // conditions may not be true if the dialog was opened on a different virtual
+  // desktop to the one the browser window is on.
+  dialog_->Show();
+  dialog_->Activate();
+}
+
+AppModalDialogDelegateTesting*
+JavascriptMessageBoxHandler::GetTestingInterface() {
+  return this;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// JavascriptMessageBoxHandler, AppModalDialogDelegateTesting implementation:
+
+views::DialogDelegate* JavascriptMessageBoxHandler::GetDialogDelegate() {
+  return this;
+}
+
+//////////////////////////////////////////////////////////////////////////////
 // JavascriptMessageBoxHandler, views::DialogDelegate implementation:
 
 int JavascriptMessageBoxHandler::GetDialogButtons() const {
   int dialog_buttons = 0;
   if (dialog_flags_ & MessageBoxView::kFlagHasOKButton)
     dialog_buttons = DIALOGBUTTON_OK;
 
   if (dialog_flags_ & MessageBoxView::kFlagHasCancelButton)
     dialog_buttons |= DIALOGBUTTON_CANCEL;
 
@@ skipping 55 matching lines @@
 bool JavascriptMessageBoxHandler::Accept() {
   AppModalDialogQueue::ShowNextDialog();
 
   if (web_contents_) {
     web_contents_->OnJavaScriptMessageBoxClosed(
         reply_msg_, true, message_box_view_->GetInputText());
   }
   return true;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// JavascriptMessageBoxHandler, views::AppModalDialogDelegate
-// implementation:
-
-void JavascriptMessageBoxHandler::ShowModalDialog() {
-  // If the WebContents that created this dialog navigated away before this
-  // dialog became visible, simply show the next dialog if any.
-  if (!web_contents_) {
-    AppModalDialogQueue::ShowNextDialog();
-    delete this;
-    return;
-  }
-
-  web_contents_->Activate();
-  HWND root_hwnd = GetAncestor(web_contents_->GetNativeView(), GA_ROOT);
-  dialog_ = views::Window::CreateChromeWindow(root_hwnd, gfx::Rect(), this);
-  dialog_->Show();
-}
-
-void JavascriptMessageBoxHandler::ActivateModalDialog() {
-  // Ensure that the dialog is visible and at the top of the z-order. These
-  // conditions may not be true if the dialog was opened on a different virtual
-  // desktop to the one the browser window is on.
-  dialog_->Show();
-  dialog_->Activate();
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // JavascriptMessageBoxHandler, views::WindowDelegate implementation:
 
 views::View* JavascriptMessageBoxHandler::GetContentsView() {
   return message_box_view_;
 }
 
 views::View* JavascriptMessageBoxHandler::GetInitiallyFocusedView() {
   if (message_box_view_->text_box())
     return message_box_view_->text_box();
-  return views::AppModalDialogDelegate::GetInitiallyFocusedView();
+  return views::DialogDelegate::GetInitiallyFocusedView();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // JavascriptMessageBoxHandler, private:
 
 void JavascriptMessageBoxHandler::Observe(NotificationType type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
   bool web_contents_gone = false;
   if (!web_contents_)
     return;
 
   if (type == NotificationType::NAV_ENTRY_COMMITTED &&
       Source<NavigationController>(source).ptr() == web_contents_->controller())
     web_contents_gone = true;
 
   if (type == NotificationType::TAB_CONTENTS_DESTROYED &&
       Source<TabContents>(source).ptr() ==
       static_cast<TabContents*>(web_contents_))
     web_contents_gone = true;
 
   if (web_contents_gone) {
     web_contents_ = NULL;
 
     // If the dialog is visible close it.
     if (dialog_)
       dialog_->Close();
   }
 }