AppModalDialogQueue shouldn't depend on views.

Add a simple test, too.

Review URL: http://codereview.chromium.org/27080

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10320 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 8 deletions

diff --git a/chrome/browser/app_modal_dialog_queue.h b/chrome/browser/app_modal_dialog_queue.h
index ff1b5f5..9101c2e2 100644
--- a/chrome/browser/app_modal_dialog_queue.h
+++ b/chrome/browser/app_modal_dialog_queue.h
@@ -7,7 +7,7 @@
 
 #include <queue>
 
-#include "chrome/views/app_modal_dialog_delegate.h"
+#include "chrome/browser/app_modal_dialog_delegate.h"
 
 // Keeps a queue of AppModalDialogDelegates, making sure only one app modal
 // dialog is shown at a time.
@@ -23,7 +23,7 @@ class AppModalDialogQueue {
   // sloppy app modality.
   // Note: The AppModalDialogDelegate |dialog| must be window modal before it
   // can be added as app modal.
-  static void AddDialog(views::AppModalDialogDelegate* dialog);
+  static void AddDialog(AppModalDialogDelegate* dialog);
 
   // Removes the current dialog in the queue (the one that is being shown).
   // Shows the next dialog in the queue, if any is present. This does not
@@ -45,22 +45,20 @@ class AppModalDialogQueue {
   }
 
   // Accessor for |active_dialog_|.
-  static views::AppModalDialogDelegate* active_dialog() {
-    return active_dialog_;
-  }
+  static AppModalDialogDelegate* active_dialog() { return active_dialog_; }
 
  private:
   // Shows |dialog| and notifies the BrowserList that a modal dialog is showing.
-  static void ShowModalDialog(views::AppModalDialogDelegate* dialog);
+  static void ShowModalDialog(AppModalDialogDelegate* dialog);
 
   // Contains all app modal dialogs which are waiting to be shown, with the
   // currently modal dialog at the front of the queue.
-  static std::queue<views::AppModalDialogDelegate*>*
+  static std::queue<AppModalDialogDelegate*>*
       app_modal_dialog_queue_;
 
   // The currently active app-modal dialog box's delegate. NULL if there is no
   // active app-modal dialog box.
-  static views::AppModalDialogDelegate* active_dialog_;
+  static AppModalDialogDelegate* active_dialog_;
 };
 
 #endif // CHROME_BROWSER_APP_MODAL_DIALOG_QUEUE_H__