Print Preview: Set a print job's title and url correctly.

chrome/browser/printing/print_view_manager.cc

Index: chrome/browser/printing/print_view_manager.cc
===================================================================
--- chrome/browser/printing/print_view_manager.cc	(revision 80021)
+++ chrome/browser/printing/print_view_manager.cc	(working copy)
@@ -9,7 +9,9 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_job_manager.h"
+#include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/printer_query.h"
+#include "chrome/browser/ui/webui/print_preview_ui.h"
 #include "chrome/common/print_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_entry.h"
@@ -24,6 +26,25 @@
 
 using base::TimeDelta;
 
+namespace {
+
+string16 GenerateRenderSourceName(TabContents* tab_contents) {
+  string16 name(tab_contents->GetTitle());
+  if (name.empty())
+    name = l10n_util::GetStringUTF16(IDS_DEFAULT_PRINT_DOCUMENT_TITLE);
+  return name;
+}
+
+GURL GenerateRenderSourceUrl(TabContents* tab_contents) {
+  NavigationEntry* entry = tab_contents->controller().GetActiveEntry();
+  if (entry)
+    return entry->virtual_url();
+  else

[stuartmorgan, 2011/04/01 22:34:14]

else is unnecessary here.

[Lei Zhang, 2011/04/04 22:21:03]

Copy + Paste. In any case, I'm reverting this particular change.

+    return GURL();
+}
+
+}  // namespace
+
 namespace printing {
 
 PrintViewManager::PrintViewManager(TabContents* tab_contents)
@@ -31,7 +52,8 @@
       number_pages_(0),
       waiting_to_print_(false),
       printing_succeeded_(false),
-      inside_inner_message_loop_(false) {
+      inside_inner_message_loop_(false),
+      overridden_title_url_(false) {
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   expecting_first_page_ = true;
 #endif
@@ -59,19 +81,22 @@
   }
 }
 
+void PrintViewManager::OverrideTitleAndUrl(TabContents* tab_contents) {
+  overridden_title_url_ = true;
+  overridden_title_ = GenerateRenderSourceName(tab_contents);
+  overridden_url_ = GenerateRenderSourceUrl(tab_contents);
+}
+
 string16 PrintViewManager::RenderSourceName() {
-  string16 name(tab_contents()->GetTitle());
-  if (name.empty())
-    name = l10n_util::GetStringUTF16(IDS_DEFAULT_PRINT_DOCUMENT_TITLE);
-  return name;
+  if (overridden_title_url_)
+    return overridden_title_;
+  return GenerateRenderSourceName(tab_contents());
 }
 
 GURL PrintViewManager::RenderSourceUrl() {
-  NavigationEntry* entry = tab_contents()->controller().GetActiveEntry();
-  if (entry)
-    return entry->virtual_url();
-  else
-    return GURL();
+  if (overridden_title_url_)
+    return overridden_url_;
+  return GenerateRenderSourceUrl(tab_contents());
 }
 
 void PrintViewManager::OnDidGetPrintedPagesCount(int cookie, int number_pages) {