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

chrome/browser/ui/webui/print_preview_data_source.cc

Index: chrome/browser/ui/webui/print_preview_data_source.cc
diff --git a/chrome/browser/ui/webui/print_preview_ui_html_source.cc b/chrome/browser/ui/webui/print_preview_data_source.cc
similarity index 82%
rename from chrome/browser/ui/webui/print_preview_ui_html_source.cc
rename to chrome/browser/ui/webui/print_preview_data_source.cc
index 7dad069677068dbf9886ed96881f6ae5c082512e..880e289222359e9edd33cccb30a9a5e7f3811686 100644
--- a/chrome/browser/ui/webui/print_preview_ui_html_source.cc
+++ b/chrome/browser/ui/webui/print_preview_data_source.cc
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/print_preview_ui_html_source.h"
+#include "chrome/browser/ui/webui/print_preview_data_source.h"
 
 #include <algorithm>
-#include <vector>
 
 #include "base/message_loop.h"
-#include "base/shared_memory.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/printing/print_preview_data_service_factory.h"
+#include "chrome/browser/profiles/profile.h"

[Lei Zhang, 2011/05/27 17:26:53]

nit: ordering

[kmadhusu, 2011/05/27 23:44:42]

Fixed.

+#include "chrome/browser/printing/print_preview_data_service.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
@@ -110,28 +111,23 @@ void SetLocalizedStrings(DictionaryValue* localized_strings) {
 
 }  // namespace
 
-PrintPreviewUIHTMLSource::PrintPreviewUIHTMLSource()
+PrintPreviewDataSource::PrintPreviewDataSource(Profile* profile)
     : DataSource(chrome::kChromeUIPrintHost, MessageLoop::current()),
-      data_(std::make_pair(static_cast<base::SharedMemory*>(NULL), 0U)) {
+      profile_(profile) {
 }
 
-PrintPreviewUIHTMLSource::~PrintPreviewUIHTMLSource() {
-  delete data_.first;
+PrintPreviewDataSource::~PrintPreviewDataSource() {
 }
 
-void PrintPreviewUIHTMLSource::GetPrintPreviewData(PrintPreviewData* data) {
-  *data = data_;
-}
-
-void PrintPreviewUIHTMLSource::SetPrintPreviewData(
-    const PrintPreviewData& data) {
-  delete data_.first;
-  data_ = data;
-}
+void PrintPreviewDataSource::StartDataRequest(const std::string& path,
+                                              bool is_incognito,
+                                              int request_id) {
+  scoped_refptr<RefCountedBytes> data(new RefCountedBytes);
+  if (path.size() > 10 && path.substr(0, 10) == "print.pdf/") {

[Lei Zhang, 2011/05/27 17:26:53]

if you set a boolean to true here, then you don't have to repeat the similar
check below on line 149. If you ever change it afterwards, you'll only need to
change the check here.

[kmadhusu, 2011/05/27 23:44:42]

Done.

+    PrintPreviewDataServiceFactory::GetForProfile(profile_)->
+        GetDataEntry(path.substr(10), &data);
+  }
 
-void PrintPreviewUIHTMLSource::StartDataRequest(const std::string& path,
-                                                bool is_incognito,
-                                                int request_id) {
   if (path.empty()) {
     // Print Preview Index page.
     DictionaryValue localized_strings;
@@ -150,19 +146,13 @@ void PrintPreviewUIHTMLSource::StartDataRequest(const std::string& path,
 
     SendResponse(request_id, html_bytes);
     return;
-  } else if (path == "print.pdf" && data_.first) {
+  } else if (path.size() > 10 &&
+             path.substr(0, 10) == "print.pdf/" &&
+             data->front()) {
     // Print Preview data.
-    char* preview_data = reinterpret_cast<char*>(data_.first->memory());
-    uint32 preview_data_size = data_.second;
-
-    scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
-    html_bytes->data.resize(preview_data_size);
-    std::vector<unsigned char>::iterator it = html_bytes->data.begin();
-    for (uint32 i = 0; i < preview_data_size; ++i, ++it)
-      *it = *(preview_data + i);
-    SendResponse(request_id, html_bytes);
+    SendResponse(request_id, data);
     return;
-  } else {
+ } else {
     // Invalid request.
     scoped_refptr<RefCountedBytes> empty_bytes(new RefCountedBytes);
     SendResponse(request_id, empty_bytes);
@@ -170,11 +160,8 @@ void PrintPreviewUIHTMLSource::StartDataRequest(const std::string& path,
   }
 }
 
-std::string PrintPreviewUIHTMLSource::GetMimeType(
-    const std::string& path) const {
-  // Print Preview Index page.
+std::string PrintPreviewDataSource::GetMimeType(const std::string& path) const {
   if (path.empty())
-    return "text/html";
-  // Print Preview data.
-  return "application/pdf";
+    return "text/html";  // Print Preview Index Page.
+  return "application/pdf";  // Print Preview data
 }