Chromium Code Reviews| Index: chrome/browser/printing/print_view_manager.cc |
| diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc |
| index 756e5fe082ae9902b3e6c70030e5258d9ef6f01b..e7fdebc7e953dbd044745a2e44dbaa5be7001ced 100644 |
| --- a/chrome/browser/printing/print_view_manager.cc |
| +++ b/chrome/browser/printing/print_view_manager.cc |
| @@ -60,10 +60,14 @@ void PrintViewManager::RenderViewGone() { |
| } |
| string16 PrintViewManager::RenderSourceName() { |
| - string16 name(tab_contents()->GetTitle()); |
| - if (name.empty()) |
| - name = l10n_util::GetStringUTF16(IDS_DEFAULT_PRINT_DOCUMENT_TITLE); |
| - return name; |
| + if (job_title_.empty()) { |
|
stuartmorgan
2011/03/30 22:59:17
This is where some of that discussion should go. I
|
| + string16 name(tab_contents()->GetTitle()); |
| + if (name.empty()) |
| + job_title_ = l10n_util::GetStringUTF16(IDS_DEFAULT_PRINT_DOCUMENT_TITLE); |
| + else |
| + job_title_ = name; |
| + } |
| + return job_title_; |
| } |
| GURL PrintViewManager::RenderSourceUrl() { |
| @@ -74,10 +78,13 @@ GURL PrintViewManager::RenderSourceUrl() { |
| return GURL(); |
| } |
| -void PrintViewManager::OnDidGetPrintedPagesCount(int cookie, int number_pages) { |
| +void PrintViewManager::OnDidGetBasicPrintJobInfo( |
| + int cookie, int number_pages, const string16& job_title) { |
| DCHECK_GT(cookie, 0); |
| DCHECK_GT(number_pages, 0); |
| number_pages_ = number_pages; |
| + job_title_ = job_title; |
| + |
| if (!OpportunisticallyCreatePrintJob(cookie)) |
| return; |
| @@ -154,8 +161,8 @@ void PrintViewManager::OnDidPrintPage( |
| bool PrintViewManager::OnMessageReceived(const IPC::Message& message) { |
| bool handled = true; |
| IPC_BEGIN_MESSAGE_MAP(PrintViewManager, message) |
| - IPC_MESSAGE_HANDLER(PrintHostMsg_DidGetPrintedPagesCount, |
| - OnDidGetPrintedPagesCount) |
| + IPC_MESSAGE_HANDLER(PrintHostMsg_DidGetBasicPrintJobInfo, |
| + OnDidGetBasicPrintJobInfo) |
| IPC_MESSAGE_HANDLER(PrintHostMsg_DidPrintPage, OnDidPrintPage) |
| IPC_MESSAGE_UNHANDLED(handled = false) |
| IPC_END_MESSAGE_MAP() |