| Index: chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc
|
| ===================================================================
|
| --- chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc (revision 135175)
|
| +++ chrome/browser/ui/gtk/constrained_web_dialog_delegate_gtk.cc (working copy)
|
| @@ -7,13 +7,13 @@
|
| #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
|
| #include "chrome/browser/ui/gtk/tab_contents_container_gtk.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 "content/public/browser/notification_source.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "ui/base/gtk/gtk_hig_constants.h"
|
| #include "ui/gfx/size.h"
|
| +#include "ui/web_dialogs/web_dialog_delegate.h"
|
| +#include "ui/web_dialogs/web_dialog_ui.h"
|
|
|
| using content::WebContents;
|
|
|
| @@ -22,8 +22,8 @@
|
| public:
|
| ConstrainedWebDialogDelegateGtk(
|
| Profile* profile,
|
| - WebDialogDelegate* delegate,
|
| - WebDialogWebContentsDelegate* tab_delegate);
|
| + web_dialogs::WebDialogDelegate* delegate,
|
| + web_dialogs::WebDialogWebContentsDelegate* tab_delegate);
|
|
|
| virtual ~ConstrainedWebDialogDelegateGtk() {}
|
|
|
| @@ -32,11 +32,11 @@
|
| }
|
|
|
| // ConstrainedWebDialogDelegate interface
|
| - virtual const WebDialogDelegate*
|
| + virtual const web_dialogs::WebDialogDelegate*
|
| GetWebDialogDelegate() const OVERRIDE {
|
| return impl_->GetWebDialogDelegate();
|
| }
|
| - virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
|
| + virtual web_dialogs::WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
|
| return impl_->GetWebDialogDelegate();
|
| }
|
| virtual void OnDialogCloseFromWebUI() OVERRIDE {
|
| @@ -79,8 +79,8 @@
|
|
|
| ConstrainedWebDialogDelegateGtk::ConstrainedWebDialogDelegateGtk(
|
| Profile* profile,
|
| - WebDialogDelegate* delegate,
|
| - WebDialogWebContentsDelegate* tab_delegate)
|
| + web_dialogs::WebDialogDelegate* delegate,
|
| + web_dialogs::WebDialogWebContentsDelegate* tab_delegate)
|
| : impl_(new ConstrainedWebDialogDelegateBase(profile, delegate, tab_delegate)),
|
| tab_contents_container_(NULL) {
|
| tab_contents_container_.SetTab(tab());
|
| @@ -98,8 +98,8 @@
|
| ConstrainedWebDialogDelegate*
|
| ConstrainedWebDialogUI::CreateConstrainedWebDialog(
|
| Profile* profile,
|
| - WebDialogDelegate* delegate,
|
| - WebDialogWebContentsDelegate* tab_delegate,
|
| + web_dialogs::WebDialogDelegate* delegate,
|
| + web_dialogs::WebDialogWebContentsDelegate* tab_delegate,
|
| TabContentsWrapper* overshadowed) {
|
| ConstrainedWebDialogDelegateGtk* constrained_delegate =
|
| new ConstrainedWebDialogDelegateGtk(profile, delegate, tab_delegate);
|
|
|