| Index: chrome/browser/ui/webui/print_preview_ui.cc
|
| diff --git a/chrome/browser/ui/webui/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview_ui.cc
|
| index 29253d45b2dc4db0be6c6c84ef34bccf1acde94f..6582c949fa5b1ffcb55c39b0c066fa5e4ae2afb1 100644
|
| --- a/chrome/browser/ui/webui/print_preview_ui.cc
|
| +++ b/chrome/browser/ui/webui/print_preview_ui.cc
|
| @@ -5,28 +5,34 @@
|
| #include "chrome/browser/ui/webui/print_preview_ui.h"
|
|
|
| #include "base/values.h"
|
| +#include "chrome/browser/printing/print_preview_data_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/ui/webui/print_preview_data_source.h"
|
| #include "chrome/browser/ui/webui/print_preview_handler.h"
|
| -#include "chrome/browser/ui/webui/print_preview_ui_html_source.h"
|
| -#include "content/browser/browser_thread.h"
|
| #include "content/browser/tab_contents/tab_contents.h"
|
|
|
| -PrintPreviewUI::PrintPreviewUI(TabContents* contents)
|
| - : WebUI(contents),
|
| - html_source_(new PrintPreviewUIHTMLSource()) {
|
| +PrintPreviewUI::PrintPreviewUI(TabContents* contents) : WebUI(contents) {
|
| // PrintPreviewUI owns |handler|.
|
| PrintPreviewHandler* handler = new PrintPreviewHandler();
|
| AddMessageHandler(handler->Attach(this));
|
|
|
| - // Set up the chrome://print/ source.
|
| - contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source_);
|
| + // Set up the chrome://print/ data source.
|
| + contents->profile()->GetChromeURLDataManager()->AddDataSource(
|
| + new PrintPreviewDataSource(this));
|
| +
|
| + printf("constructor : %p \n", this);
|
| }
|
|
|
| PrintPreviewUI::~PrintPreviewUI() {
|
| + print_preview_data_service()->RemoveEntry(this);
|
| +}
|
| +
|
| +void PrintPreviewUI::GetPrintPreviewData(scoped_refptr<RefCountedBytes>* data) {
|
| + print_preview_data_service()->GetDataEntry(this, data);
|
| }
|
|
|
| -PrintPreviewUIHTMLSource* PrintPreviewUI::html_source() {
|
| - return html_source_.get();
|
| +void PrintPreviewUI::SetPrintPreviewData(const RefCountedBytes* data) {
|
| + print_preview_data_service()->SetDataEntry(this, data);
|
| }
|
|
|
| void PrintPreviewUI::OnInitiatorTabClosed(
|
| @@ -46,3 +52,7 @@ void PrintPreviewUI::OnPreviewDataIsAvailable(int expected_pages_count,
|
| CallJavascriptFunction("updatePrintPreview", pages_count, title,
|
| is_preview_modifiable);
|
| }
|
| +
|
| +PrintPreviewDataService* PrintPreviewUI::print_preview_data_service() {
|
| + return PrintPreviewDataService::GetInstance();
|
| +}
|
|
|