PrintPreview: Print Preview is not staying associated with initiator renderer.

chrome/browser/ui/webui/print_preview_ui.cc

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..17893e2419b421c9056ea52de797716ae28ff185 100644
--- a/chrome/browser/ui/webui/print_preview_ui.cc
+++ b/chrome/browser/ui/webui/print_preview_ui.cc
@@ -7,26 +7,35 @@
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.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.
+  data_source_ = PrintPreviewDataSource::GetInstance();
+  contents->profile()->GetChromeURLDataManager()->AddDataSource(data_source_);
+
+  // Store the PrintPreviewUIAddress as a string.
+  char preview_ui_addr[128];
+  snprintf(preview_ui_addr, 128, "%p", this);
+  preview_ui_addr_str_.reset(new std::string(preview_ui_addr));
 }
 
 PrintPreviewUI::~PrintPreviewUI() {
+  data_source_->RemoveEntry(*preview_ui_addr_str_);
+}
+
+void PrintPreviewUI::GetPrintPreviewData(
+    PrintPreviewDataSource::PrintPreviewData* data) {
+  data_source_->GetDataEntry(*preview_ui_addr_str_, data);
 }
 
-PrintPreviewUIHTMLSource* PrintPreviewUI::html_source() {
-  return html_source_.get();
+void PrintPreviewUI::SetPrintPreviewData(
+    const PrintPreviewDataSource::PrintPreviewData& data) {
+  data_source_->SetDataEntry(*preview_ui_addr_str_, data);
 }
 
 void PrintPreviewUI::OnInitiatorTabClosed(
@@ -43,6 +52,7 @@ void PrintPreviewUI::OnPreviewDataIsAvailable(int expected_pages_count,
   FundamentalValue pages_count(expected_pages_count);
   StringValue title(job_title);
   FundamentalValue is_preview_modifiable(modifiable);
+  StringValue tab_identifier(*preview_ui_addr_str_);
   CallJavascriptFunction("updatePrintPreview", pages_count, title,
-                         is_preview_modifiable);
+                         is_preview_modifiable, tab_identifier);
 }