Print Preview: Store preview data in the print preview handler....

chrome/browser/dom_ui/print_preview_ui.cc

Index: chrome/browser/dom_ui/print_preview_ui.cc
===================================================================
--- chrome/browser/dom_ui/print_preview_ui.cc	(revision 73548)
+++ chrome/browser/dom_ui/print_preview_ui.cc	(working copy)
@@ -4,145 +4,34 @@
 
 #include "chrome/browser/dom_ui/print_preview_ui.h"
 
-#include <algorithm>
-
-#include "base/message_loop.h"
-#include "base/singleton.h"
-#include "base/string_piece.h"
-#include "base/values.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/print_preview_handler.h"
-#include "chrome/browser/dom_ui/web_ui_theme_source.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/jstemplate_builder.h"
-#include "chrome/common/url_constants.h"
-#include "grit/browser_resources.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
+#include "chrome/browser/dom_ui/print_preview_ui_html_source.h"
 
-namespace {
-
-void SetLocalizedStrings(DictionaryValue* localized_strings) {
-  localized_strings->SetString(std::string("title"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_TITLE));
-  localized_strings->SetString(std::string("loading"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_LOADING));
-  localized_strings->SetString(std::string("noPlugin"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_NO_PLUGIN));
-  localized_strings->SetString(std::string("noPrinter"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_NO_PRINTER));
-
-  localized_strings->SetString(std::string("printButton"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_PRINT_BUTTON));
-  localized_strings->SetString(std::string("cancelButton"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_CANCEL_BUTTON));
-
-  localized_strings->SetString(std::string("optionAllPages"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_OPTION_ALL_PAGES));
-  localized_strings->SetString(std::string("optionBw"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_OPTION_BW));
-  localized_strings->SetString(std::string("optionCollate"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_OPTION_COLLATE));
-  localized_strings->SetString(std::string("optionColor"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_OPTION_COLOR));
-  localized_strings->SetString(std::string("optionLandscape"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_OPTION_LANDSCAPE));
-  localized_strings->SetString(std::string("optionPortrait"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_OPTION_PORTRAIT));
-  localized_strings->SetString(std::string("optionTwoSided"),
-      l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_OPTION_TWO_SIDED));
-}
-
-}  // namespace
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// PrintPreviewUIHTMLSource
-//
-////////////////////////////////////////////////////////////////////////////////
-
-class PrintPreviewUIHTMLSource : public ChromeURLDataManager::DataSource {
- public:
-  PrintPreviewUIHTMLSource();
-  virtual ~PrintPreviewUIHTMLSource();
-
-  // Called when the network layer has requested a resource underneath
-  // the path we registered.
-  virtual void StartDataRequest(const std::string& path,
-                                bool is_off_the_record,
-                                int request_id);
-  virtual std::string GetMimeType(const std::string&) const;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PrintPreviewUIHTMLSource);
-};
-
-PrintPreviewUIHTMLSource::PrintPreviewUIHTMLSource()
-    : DataSource(chrome::kChromeUIPrintHost, MessageLoop::current()) {
-}
-
-PrintPreviewUIHTMLSource::~PrintPreviewUIHTMLSource() {}
-
-void PrintPreviewUIHTMLSource::StartDataRequest(const std::string& path,
-                                                bool is_off_the_record,
-                                                int request_id) {
-  // Print Preview Index page.
-  if (path.empty()) {
-    DictionaryValue localized_strings;
-    SetLocalizedStrings(&localized_strings);
-    SetFontAndTextDirection(&localized_strings);
-
-    static const base::StringPiece print_html(
-        ResourceBundle::GetSharedInstance().GetRawDataResource(
-            IDR_PRINT_PREVIEW_HTML));
-    const std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
-        print_html, &localized_strings);
-
-    scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
-    html_bytes->data.resize(full_html.size());
-    std::copy(full_html.begin(), full_html.end(), html_bytes->data.begin());
-
-    SendResponse(request_id, html_bytes);
-    return;
-  }
-
-  // Print Preview data.
-  NOTIMPLEMENTED() << "No PDF for you";
-  scoped_refptr<RefCountedBytes> data_bytes(new RefCountedBytes);
-  SendResponse(request_id, data_bytes);
-}
-
-std::string PrintPreviewUIHTMLSource::GetMimeType(
-    const std::string& path) const {
-  // Print Preview Index page.
-  if (path.empty())
-    return "text/html";
-  // Print Preview data.
-  return "application/pdf";
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// PrintPreviewUI
-//
-////////////////////////////////////////////////////////////////////////////////
-
-PrintPreviewUI::PrintPreviewUI(TabContents* contents) : DOMUI(contents) {
+PrintPreviewUI::PrintPreviewUI(TabContents* contents)
+    : DOMUI(contents),
+      html_source_(make_scoped_refptr(new PrintPreviewUIHTMLSource())) {

[James Hawkins, 2011/02/03 00:53:52]

Why do you need to use make_scoped_refptr() here?

[Lei Zhang, 2011/02/03 02:19:32]

Because html_source_ is a scoped_refptr<PrintPreviewUIHTMLSource>, not a
PrintPreviewUIHTMLSource*. Perhaps it was confusing since html_source()'s
signature is says it returns PrintPreviewUIHTMLSource*, but the code says
"return html_source_", so I changed it to return html_source_.get().

[James Hawkins, 2011/02/03 21:51:40]

ref_counted.h:222 -
scoped_refptr(T* p) {...}

[Lei Zhang, 2011/02/03 21:58:22]

Removed.

   // PrintPreviewUI owns |handler|.
   PrintPreviewHandler* handler = new PrintPreviewHandler();
   AddMessageHandler(handler->Attach(this));
 
+  // Add a reference to |html_source_| since we need it to be valid for
+  // calls to html_source().
+  html_source_->AddRef();

[James Hawkins, 2011/02/03 00:53:52]

The scoped_refptr constructor which accepts T* calls AddRef() and Release() for
you.

[Lei Zhang, 2011/02/03 02:19:32]

I was having problems where |html_source_| was getting destroyed too early, but
those problems magically went away, so I removed the AddRef()/Release() calls.

+
   // Set up the chrome://print/ source.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
-          make_scoped_refptr(new PrintPreviewUIHTMLSource())));
+          html_source_));
 }
 
 PrintPreviewUI::~PrintPreviewUI() {
+  html_source_->Release();
 }
+
+PrintPreviewUIHTMLSource* PrintPreviewUI::html_source() {
+  return html_source_;
+}