| Index: chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc (revision 135175)
|
| +++ chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc (working copy)
|
| @@ -10,18 +10,18 @@
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/constrained_window.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_delegate.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_ui.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "ui/web_dialogs/web_dialog_delegate.h"
|
| +#include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
|
| +#include "ui/web_dialogs/web_dialog_ui.h"
|
|
|
| using content::WebContents;
|
|
|
| ConstrainedWebDialogDelegateBase::ConstrainedWebDialogDelegateBase(
|
| Profile* profile,
|
| - WebDialogDelegate* delegate,
|
| - WebDialogWebContentsDelegate* tab_delegate)
|
| - : WebDialogWebContentsDelegate(profile),
|
| + web_dialogs::WebDialogDelegate* delegate,
|
| + web_dialogs::WebDialogWebContentsDelegate* tab_delegate)
|
| + : ChromeWebDialogWebContentsDelegate(profile),
|
| web_dialog_delegate_(delegate),
|
| window_(NULL),
|
| closed_via_webui_(false),
|
| @@ -51,12 +51,12 @@
|
| ignore_result(tab_.release());
|
| }
|
|
|
| -const WebDialogDelegate*
|
| +const web_dialogs::WebDialogDelegate*
|
| ConstrainedWebDialogDelegateBase::GetWebDialogDelegate() const {
|
| return web_dialog_delegate_;
|
| }
|
|
|
| -WebDialogDelegate*
|
| +web_dialogs::WebDialogDelegate*
|
| ConstrainedWebDialogDelegateBase::GetWebDialogDelegate() {
|
| return web_dialog_delegate_;
|
| }
|
| @@ -71,7 +71,7 @@
|
| }
|
|
|
| void ConstrainedWebDialogDelegateBase::set_override_tab_delegate(
|
| - WebDialogWebContentsDelegate* override_tab_delegate) {
|
| + web_dialogs::WebDialogWebContentsDelegate* override_tab_delegate) {
|
| override_tab_delegate_.reset(override_tab_delegate);
|
| }
|
|
|
|
|