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..d3e4093a582d40f2140a441a688952ab57127146 100644 |
--- a/chrome/browser/ui/webui/print_preview_ui.cc |
+++ b/chrome/browser/ui/webui/print_preview_ui.cc |
@@ -4,29 +4,42 @@ |
#include "chrome/browser/ui/webui/print_preview_ui.h" |
+#include "base/string_util.h" |
#include "base/values.h" |
#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/printing/print_preview_data_service_factory.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. |
+ PrintPreviewDataSource* data_source = |
+ new PrintPreviewDataSource(contents->profile()); |
+ contents->profile()->GetChromeURLDataManager()->AddDataSource(data_source); |
+ |
+ // Store the PrintPreviewUIAddress as a string. Since the memory address is |
+ // used as the identifier the string size is (2 * sizeof(this)) + 3, where |
+ // 3 is for '0x' and null terminator. |
Lei Zhang
2011/05/28 00:12:38
How about:
// "0x" + deadc0de + '\0' = 2 + 2 * siz
kmadhusu
2011/05/29 00:04:26
Done.
|
+ char preview_ui_addr[(2 * sizeof(this)) + 3]; |
+ base::snprintf(preview_ui_addr, sizeof(preview_ui_addr), "%p", this); |
+ preview_ui_addr_str_ = preview_ui_addr; |
} |
PrintPreviewUI::~PrintPreviewUI() { |
+ print_preview_data_service()->RemoveEntry(preview_ui_addr_str_); |
+} |
+ |
+void PrintPreviewUI::GetPrintPreviewData(scoped_refptr<RefCountedBytes>* data) { |
+ print_preview_data_service()->GetDataEntry(preview_ui_addr_str_, data); |
} |
-PrintPreviewUIHTMLSource* PrintPreviewUI::html_source() { |
- return html_source_.get(); |
+void PrintPreviewUI::SetPrintPreviewData(const RefCountedBytes* data) { |
+ print_preview_data_service()->SetDataEntry(preview_ui_addr_str_, data); |
} |
void PrintPreviewUI::OnInitiatorTabClosed( |
@@ -43,6 +56,12 @@ void PrintPreviewUI::OnPreviewDataIsAvailable(int expected_pages_count, |
FundamentalValue pages_count(expected_pages_count); |
StringValue title(job_title); |
FundamentalValue is_preview_modifiable(modifiable); |
+ StringValue ui_identifier(preview_ui_addr_str_); |
CallJavascriptFunction("updatePrintPreview", pages_count, title, |
- is_preview_modifiable); |
+ is_preview_modifiable, ui_identifier); |
+} |
+ |
+PrintPreviewDataService* PrintPreviewUI::print_preview_data_service() { |
+ return PrintPreviewDataServiceFactory::GetForProfile( |
+ tab_contents()->profile()); |
} |