Print Preview: Make print preview tab modal. (try 2)

chrome/browser/printing/print_view_manager.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_view_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 15 matching lines @@
 #include "printing/metafile.h"
 #include "printing/metafile_impl.h"
 #include "printing/printed_document.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::TimeDelta;
 using content::BrowserThread;
 
 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 =
       g_browser_process->print_job_manager();
   // May be NULL in tests.
   if (!print_job_manager)
     return;
 
   scoped_refptr<printing::PrinterQuery> printer_query;
   print_job_manager->PopPrinterQuery(cookie, &printer_query);
   if (printer_query.get()) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&printing::PrinterQuery::StopWorker, printer_query.get()));
   }
 }
 
 }  // namespace
 
 namespace printing {
 
 PrintViewManager::PrintViewManager(TabContentsWrapper* tab)
     : TabContentsObserver(tab->tab_contents()),
       tab_(tab),
       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)
   expecting_first_page_ = true;
 #endif
 }
 
 PrintViewManager::~PrintViewManager() {
   ReleasePrinterQuery(cookie_);
   DisconnectFromCurrentPrintJob();
@@ skipping 38 matching lines @@
     return;
   RenderViewHost* rvh = tab_contents()->render_view_host();
   rvh->Send(new PrintMsg_PreviewPrintingRequestCancelled(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);
 }
 
 void PrintViewManager::RenderViewGone() {
   if (!print_job_.get())
     return;
 
   scoped_refptr<PrintedDocument> document(print_job_->document());
   if (document) {
     // If IsComplete() returns false, the document isn't completely rendered.
     // Since our renderer is gone, there's nothing to do, cancel it. Otherwise,
     // the print job may finish without problem.
     TerminatePrintJob(!document->IsComplete());
   }
 }
 
-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) {
   DCHECK_GT(cookie, 0);
   DCHECK_GT(number_pages, 0);
   number_pages_ = number_pages;
   OpportunisticallyCreatePrintJob(cookie);
 }
 
 void PrintViewManager::OnDidGetDocumentCookie(int cookie) {
@@ skipping 357 matching lines @@
 }
 
 bool PrintViewManager::PrintNowInternal(IPC::Message* message) {
   // Don't print / print preview interstitials.
   if (tab_contents()->showing_interstitial_page())
     return false;
   return Send(message);
 }
 
 }  // namespace printing