| Index: chrome/browser/printing/print_preview_tab_controller.cc
|
| ===================================================================
|
| --- chrome/browser/printing/print_preview_tab_controller.cc (revision 135175)
|
| +++ chrome/browser/printing/print_preview_tab_controller.cc (working copy)
|
| @@ -23,8 +23,7 @@
|
| #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/print_preview/print_preview_ui.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 "chrome/common/chrome_content_client.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/url_constants.h"
|
| @@ -38,6 +37,8 @@
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/render_view_host_delegate.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "ui/web_dialogs/web_dialog_delegate.h"
|
| +#include "ui/web_dialogs/web_dialog_ui.h"
|
| #include "webkit/plugins/webplugininfo.h"
|
|
|
| using content::NavigationController;
|
| @@ -57,7 +58,7 @@
|
|
|
| // WebDialogDelegate that specifies what the print preview dialog
|
| // will look like.
|
| -class PrintPreviewTabDelegate : public WebDialogDelegate {
|
| +class PrintPreviewTabDelegate : public web_dialogs::WebDialogDelegate {
|
| public:
|
| explicit PrintPreviewTabDelegate(TabContentsWrapper* initiator_tab);
|
| virtual ~PrintPreviewTabDelegate();
|
| @@ -149,7 +150,8 @@
|
|
|
| // WebContentsDelegate that forwards shortcut keys in the print preview
|
| // renderer to the browser.
|
| -class PrintPreviewWebContentDelegate : public WebDialogWebContentsDelegate {
|
| +class PrintPreviewWebContentDelegate
|
| + : public ChromeWebDialogWebContentsDelegate {
|
| public:
|
| PrintPreviewWebContentDelegate(Profile* profile,
|
| TabContentsWrapper* initiator_tab);
|
| @@ -168,7 +170,7 @@
|
| PrintPreviewWebContentDelegate::PrintPreviewWebContentDelegate(
|
| Profile* profile,
|
| TabContentsWrapper* initiator_tab)
|
| - : WebDialogWebContentsDelegate(profile),
|
| + : ChromeWebDialogWebContentsDelegate(profile),
|
| tab_(initiator_tab) {}
|
|
|
| PrintPreviewWebContentDelegate::~PrintPreviewWebContentDelegate() {}
|
| @@ -428,7 +430,7 @@
|
|
|
| // |web_dialog_ui_delegate| deletes itself in
|
| // PrintPreviewTabDelegate::OnDialogClosed().
|
| - WebDialogDelegate* web_dialog_delegate =
|
| + web_dialogs::WebDialogDelegate* web_dialog_delegate =
|
| new PrintPreviewTabDelegate(initiator_tab);
|
| // |web_tab_content_delegate|'s owner is |constrained_web_ui_delegate|.
|
| PrintPreviewWebContentDelegate* pp_wcd =
|
|
|