| Index: chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h
|
| ===================================================================
|
| --- chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h (revision 134857)
|
| +++ chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h (working copy)
|
| @@ -9,17 +9,17 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_ui.h"
|
| +#include "chrome/browser/ui/webui/chrome_web_dialog_web_contents_delegate.h"
|
| +#include "ui/web_dialogs/web_dialog_ui.h"
|
|
|
| // Platform-agnostic base implementation of ConstrainedWebDialogDelegate.
|
| class ConstrainedWebDialogDelegateBase
|
| : public ConstrainedWebDialogDelegate,
|
| - public WebDialogWebContentsDelegate {
|
| + public ChromeWebDialogWebContentsDelegate {
|
| public:
|
| ConstrainedWebDialogDelegateBase(
|
| Profile* profile,
|
| - WebDialogDelegate* delegate,
|
| + views::WebDialogDelegate* delegate,
|
| WebDialogWebContentsDelegate* tab_delegate);
|
| virtual ~ConstrainedWebDialogDelegateBase();
|
|
|
| @@ -27,9 +27,9 @@
|
| bool closed_via_webui() const;
|
|
|
| // ConstrainedWebDialogDelegate interface.
|
| - virtual const WebDialogDelegate*
|
| + virtual const views::WebDialogDelegate*
|
| GetWebDialogDelegate() const OVERRIDE;
|
| - virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE;
|
| + virtual views::WebDialogDelegate* GetWebDialogDelegate() OVERRIDE;
|
| virtual void OnDialogCloseFromWebUI() OVERRIDE;
|
| virtual void ReleaseTabContentsOnDialogClose() OVERRIDE;
|
| virtual ConstrainedWindow* window() OVERRIDE;
|
| @@ -41,10 +41,10 @@
|
|
|
| protected:
|
| void set_override_tab_delegate(
|
| - WebDialogWebContentsDelegate* override_tab_delegate);
|
| + views::WebDialogWebContentsDelegate* override_tab_delegate);
|
|
|
| private:
|
| - WebDialogDelegate* web_dialog_delegate_;
|
| + views::WebDialogDelegate* web_dialog_delegate_;
|
|
|
| // The constrained window that owns |this|. Saved so we can close it later.
|
| ConstrainedWindow* window_;
|
|
|