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

chrome/browser/printing/print_preview_message_handler.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_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_wrapper.h"
-#include "chrome/browser/ui/webui/print_preview_handler.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/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/common/content_restriction.h"
 #include "printing/page_size_margins.h"
 #include "printing/print_job_constants.h"
 
 using content::BrowserThread;
 
 namespace {
 
 void StopWorker(int document_cookie) {
   if (document_cookie <= 0)
     return;
@@ skipping 138 matching lines @@
     PrintHostMsg_DidGetPreviewPageCount_Params temp_params;
     temp_params.page_count = params.expected_pages_count;
     temp_params.document_cookie = params.document_cookie;
     temp_params.is_modifiable = params.modifiable;
     temp_params.preview_request_id = params.preview_request_id;
     print_preview_ui->OnDidGetPreviewPageCount(temp_params);
     print_preview_ui->OnReusePreviewData(params.preview_request_id);
     return;
   }
 
-  print_preview_tab->print_view_manager()->OverrideTitle(tab_contents());
-
   // TODO(joth): This seems like a good match for using RefCountedStaticMemory
   // to avoid the memory copy, but the SetPrintPreviewData call chain below
   // needs updating to accept the RefCountedMemory* base class.
   RefCountedBytes* data_bytes =
       GetDataFromHandle(params.metafile_data_handle, params.data_size);
   if (!data_bytes)
     return;
 
   print_preview_ui->SetPrintPreviewDataForIndex(COMPLETE_PREVIEW_DOCUMENT_INDEX,
                                                 data_bytes);
@@ skipping 49 matching lines @@
                         OnDidGetDefaultPageLayout)
     IPC_MESSAGE_HANDLER(PrintHostMsg_PrintPreviewCancelled,
                         OnPrintPreviewCancelled)
     IPC_MESSAGE_HANDLER(PrintHostMsg_PrintPreviewInvalidPrinterSettings,
                         OnInvalidPrinterSettings)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void PrintPreviewMessageHandler::DidStartLoading() {
-  if (tab_contents()->delegate() &&
-      PrintPreviewTabController::IsPrintPreviewTab(tab_contents_wrapper())) {
-    tab_contents()->SetContentRestrictions(content::CONTENT_RESTRICTION_PRINT);
+void PrintPreviewMessageHandler::NavigateToPendingEntry(
+    const GURL& url,
+    NavigationController::ReloadType reload_type) {
+  TabContentsWrapper* tab = tab_contents_wrapper();
+  TabContentsWrapper* preview_tab = GetPrintPreviewTab();
+  if (tab == preview_tab) {
+    // Cloud print sign-in reloads the page.
+    DCHECK(PrintPreviewTabController::IsPrintPreviewURL(url));
+    DCHECK_EQ(NavigationController::RELOAD, reload_type);
+    return;
   }
 }
 
 }  // namespace printing