| Index: chrome/browser/printing/print_view_manager.cc
|
| ===================================================================
|
| --- chrome/browser/printing/print_view_manager.cc (revision 105366)
|
| +++ chrome/browser/printing/print_view_manager.cc (working copy)
|
| @@ -31,13 +31,6 @@
|
|
|
| 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;
|
| -}
|
| -
|
| // Release the PrinterQuery identified by |cookie|.
|
| void ReleasePrinterQuery(int cookie) {
|
| printing::PrintJobManager* print_job_manager =
|
| @@ -66,7 +59,6 @@
|
| number_pages_(0),
|
| printing_succeeded_(false),
|
| inside_inner_message_loop_(false),
|
| - is_title_overridden_(false),
|
| observer_(NULL),
|
| cookie_(0) {
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| @@ -120,15 +112,16 @@
|
| rvh->Send(new PrintMsg_PreviewPrintingRequestCancelled(rvh->routing_id()));
|
| }
|
|
|
| +void PrintViewManager::PrintPreviewDone() {
|
| + RenderViewHost* rvh = tab_contents()->render_view_host();
|
| + rvh->Send(new PrintMsg_PrintPreviewDone(rvh->routing_id()));
|
| +}
|
| +
|
| void PrintViewManager::set_observer(PrintViewManagerObserver* observer) {
|
| DCHECK(!observer || !observer_);
|
| observer_ = observer;
|
| }
|
|
|
| -void PrintViewManager::ResetTitleOverride() {
|
| - is_title_overridden_ = false;
|
| -}
|
| -
|
| void PrintViewManager::StopNavigation() {
|
| // Cancel the current job, wait for the worker to finish.
|
| TerminatePrintJob(true);
|
| @@ -147,15 +140,11 @@
|
| }
|
| }
|
|
|
| -void PrintViewManager::OverrideTitle(TabContents* tab_contents) {
|
| - is_title_overridden_ = true;
|
| - overridden_title_ = GenerateRenderSourceName(tab_contents);
|
| -}
|
| -
|
| string16 PrintViewManager::RenderSourceName() {
|
| - if (is_title_overridden_)
|
| - return overridden_title_;
|
| - return GenerateRenderSourceName(tab_contents());
|
| + string16 name(tab_contents()->GetTitle());
|
| + if (name.empty())
|
| + name = l10n_util::GetStringUTF16(IDS_DEFAULT_PRINT_DOCUMENT_TITLE);
|
| + return name;
|
| }
|
|
|
| void PrintViewManager::OnDidGetPrintedPagesCount(int cookie, int number_pages) {
|
|
|