Print Preview: Make print preview tab modal.

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"
@@ skipping 153 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 50 matching lines @@
     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);
+  TabContentsWrapper* tab_wrapper = tab_contents_wrapper();
+  TabContents* tab = tab_contents();
+  if (tab->delegate() &&
+      PrintPreviewTabController::IsPrintPreviewTab(tab_wrapper)) {
+    tab->SetContentRestrictions(content::CONTENT_RESTRICTION_PRINT);
+
+    // Need to get the initiator tab to enabled advanced printing.
+    PrintPreviewTabController* tab_controller =
+        PrintPreviewTabController::GetInstance();
+    if (tab_controller) {
+      TabContentsWrapper* initiator_tab_wrapper =
+          tab_controller->GetInitiatorTab(tab_wrapper);
+      if (initiator_tab_wrapper) {
+        TabContents* initiator_tab = initiator_tab_wrapper->tab_contents();
+        initiator_tab->SetContentRestrictions(
+            initiator_tab->content_restrictions());
+      }
+    }

[vandebo (ex-Chrome), 2011/11/02 20:50:30]

What should happen if either of these fail?

[Lei Zhang, 2011/11/02 22:50:03]

Kausalya was wondering where we unset this, and it turns out this is redundant.
In a separate CL, I changed tab (un)blocking to update the printing state.

+  }
+}
+
+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