AppModalDialogQueue shouldn't depend on views.

chrome/browser/app_modal_dialog_delegate.h

Index: chrome/browser/app_modal_dialog_delegate.h
===================================================================
--- chrome/browser/app_modal_dialog_delegate.h	(revision 10204)
+++ chrome/browser/app_modal_dialog_delegate.h	(working copy)
@@ -2,24 +2,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_VIEWS_APP_MODAL_DIALOG_DELEGATE_H__
-#define CHROME_VIEWS_APP_MODAL_DIALOG_DELEGATE_H__
+#ifndef CHROME_BROWSER_APP_MODAL_DIALOG_DELEGATE_H_
+#define CHROME_BROWSER_APP_MODAL_DIALOG_DELEGATE_H_
 
-#include "chrome/views/dialog_delegate.h"
-
+#if defined(OS_WIN)
 namespace views {
+class DialogDelegate;
+}
+#endif
 
+class AppModalDialogDelegateTesting {
+ public:
+#if defined(OS_WIN)
+  virtual views::DialogDelegate* GetDialogDelegate() = 0;
+#endif
+};
+
 // Pure virtual interface for a window which is app modal.
-class AppModalDialogDelegate : public DialogDelegate {
+class AppModalDialogDelegate {
  public:
   // Called by the app modal window queue when it is time to show this window.
   virtual void ShowModalDialog() = 0;
 
   // Called by the app modal window queue to activate the window.
   virtual void ActivateModalDialog() = 0;
+
+  // Returns the interface used to control this dialog from testing. Should
+  // only be used in testing code.
+  virtual AppModalDialogDelegateTesting* GetTestingInterface() = 0;
 };
 
-} // namespace views
+#endif  // #ifndef CHROME_BROWSER_APP_MODAL_DIALOG_DELEGATE_H_
 
-#endif  // #ifndef CHROME_VIEWS_APP_MODAL_DIALOG_DELEGATE_H__
-
Property changes on: chrome\browser\app_modal_dialog_delegate.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/views/app_modal_dialog_delegate.h:r69-2775