Print preview: Handle all tab navigations in PrintPreviewTabController instead of in two places. Ha…

chrome/browser/printing/print_preview_message_handler.cc

 // Copyright (c) 2012 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_preview_message_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/shared_memory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
 #include "chrome/common/print_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "printing/page_size_margins.h"
 #include "printing/print_job_constants.h"
 
 using content::BrowserThread;
-using content::NavigationController;
 using content::WebContents;
 
 namespace {
 
 void StopWorker(int document_cookie) {
   if (document_cookie <= 0)
     return;
 
   printing::PrintJobManager* print_job_manager =
       g_browser_process->print_job_manager();
@@ skipping 201 matching lines @@
                         OnPrintPreviewCancelled)
     IPC_MESSAGE_HANDLER(PrintHostMsg_PrintPreviewInvalidPrinterSettings,
                         OnInvalidPrinterSettings)
     IPC_MESSAGE_HANDLER(PrintHostMsg_PrintPreviewScalingDisabled,
                         OnPrintPreviewScalingDisabled)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void PrintPreviewMessageHandler::NavigateToPendingEntry(
-    const GURL& url,
-    NavigationController::ReloadType reload_type) {
-  TabContents* tab = tab_contents();
-  TabContents* preview_tab = GetPrintPreviewTab();
-  if (tab == preview_tab) {
-    // Cloud print sign-in reloads the page.

[Lei Zhang, 2012/08/21 18:21:23]

I don't think we do this anymore. Cloud print sign-in is in a separate
constrained window on Linux dev channel here. I assume the same on CrOS? This
must have been to support the old cloud print sign-in workflow before the
redesign.

[Albert Bodenhamer, 2012/08/21 18:28:55]

The need for this actually went away quite a while before the recent redesign. 
Thanks for catching it.

On 2012/08/21 18:21:23, Lei Zhang wrote:

-    DCHECK(PrintPreviewTabController::IsPrintPreviewURL(url));
-    DCHECK_EQ(NavigationController::RELOAD, reload_type);
-    return;
-  }
-  // If |tab| is navigating and it has a print preview tab, notify |tab| to
-  // consider print preview done so it unfreezes the renderer in the case of
-  // window.print().
-  if (preview_tab)
-    tab->print_view_manager()->PrintPreviewDone();
-}
-
 }  // namespace printing