| Index: chrome/browser/ui/views/web_dialog_view.h
|
| ===================================================================
|
| --- chrome/browser/ui/views/web_dialog_view.h (revision 135175)
|
| +++ chrome/browser/ui/views/web_dialog_view.h (working copy)
|
| @@ -12,8 +12,9 @@
|
| #include "base/gtest_prod_util.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/tab_render_watcher.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_delegate.h"
|
| -#include "chrome/browser/ui/webui/web_dialog_web_contents_delegate.h"
|
| +#include "chrome/browser/ui/webui/chrome_web_dialog_web_contents_delegate.h"
|
| +#include "ui/web_dialogs/web_dialog_delegate.h"
|
| +#include "ui/web_dialogs/web_dialog_ui.h"
|
| #include "ui/gfx/size.h"
|
| #include "ui/views/view.h"
|
| #include "ui/views/widget/widget_delegate.h"
|
| @@ -43,14 +44,14 @@
|
| // content::BrowserContext.
|
| class WebDialogView
|
| : public views::View,
|
| - public WebDialogWebContentsDelegate,
|
| - public WebDialogDelegate,
|
| + public ChromeWebDialogWebContentsDelegate,
|
| + public web_dialogs::WebDialogDelegate,
|
| public views::WidgetDelegate,
|
| public TabRenderWatcher::Delegate {
|
| public:
|
| WebDialogView(Profile* profile,
|
| Browser* browser,
|
| - WebDialogDelegate* delegate);
|
| + web_dialogs::WebDialogDelegate* delegate);
|
| virtual ~WebDialogView();
|
|
|
| // For testing.
|
| @@ -132,7 +133,7 @@
|
| // about when the dialog is closing. For all other actions (besides dialog
|
| // closing) we delegate to the creator of this view, which we keep track of
|
| // using this variable.
|
| - WebDialogDelegate* delegate_;
|
| + web_dialogs::WebDialogDelegate* delegate_;
|
|
|
| // Controls lifetime of dialog.
|
| scoped_ptr<WebDialogController> dialog_controller_;
|
|
|