| Index: chrome/browser/download/download_danger_prompt.cc
|
| diff --git a/chrome/browser/download/download_danger_prompt.cc b/chrome/browser/download/download_danger_prompt.cc
|
| index 13dec40756eea4b39ce96f6d80581836c6eecc28..2f8977b3e1a2e0f16dc9aab6dfd12e5910d745ad 100644
|
| --- a/chrome/browser/download/download_danger_prompt.cc
|
| +++ b/chrome/browser/download/download_danger_prompt.cc
|
| @@ -7,7 +7,7 @@
|
| #include "base/bind.h"
|
| #include "chrome/browser/download/chrome_download_manager_delegate.h"
|
| #include "chrome/browser/ui/browser_dialogs.h"
|
| -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| +#include "chrome/browser/ui/tab_contents/tab_contents.h"
|
| #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/download_danger_type.h"
|
| @@ -24,7 +24,7 @@ class DownloadDangerPromptImpl
|
| public TabModalConfirmDialogDelegate {
|
| public:
|
| DownloadDangerPromptImpl(content::DownloadItem* item,
|
| - TabContentsWrapper* tab_contents_wrapper,
|
| + TabContents* tab_contents,
|
| const base::Closure& accepted,
|
| const base::Closure& canceled);
|
| virtual ~DownloadDangerPromptImpl();
|
| @@ -63,10 +63,10 @@ class DownloadDangerPromptImpl
|
|
|
| DownloadDangerPromptImpl::DownloadDangerPromptImpl(
|
| content::DownloadItem* download,
|
| - TabContentsWrapper* tab_contents_wrapper,
|
| + TabContents* tab_contents,
|
| const base::Closure& accepted,
|
| const base::Closure& canceled)
|
| - : TabModalConfirmDialogDelegate(tab_contents_wrapper->web_contents()),
|
| + : TabModalConfirmDialogDelegate(tab_contents->web_contents()),
|
| download_(download),
|
| accepted_(accepted),
|
| canceled_(canceled) {
|
| @@ -145,13 +145,12 @@ void DownloadDangerPromptImpl::PrepareToClose() {
|
| // static
|
| DownloadDangerPrompt* DownloadDangerPrompt::Create(
|
| content::DownloadItem* item,
|
| - TabContentsWrapper* tab_contents_wrapper,
|
| + TabContents* tab_contents,
|
| const base::Closure& accepted,
|
| const base::Closure& canceled) {
|
| DownloadDangerPromptImpl* prompt =
|
| - new DownloadDangerPromptImpl(item, tab_contents_wrapper,
|
| - accepted, canceled);
|
| + new DownloadDangerPromptImpl(item, tab_contents, accepted, canceled);
|
| // |prompt| will be deleted when the dialog is done.
|
| - browser::ShowTabModalConfirmDialog(prompt, tab_contents_wrapper);
|
| + browser::ShowTabModalConfirmDialog(prompt, tab_contents);
|
| return prompt;
|
| }
|
|
|