Merge 97702, 97820, 97976

chrome/browser/ui/webui/print_preview_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/ui/webui/print_preview_handler.h"
 
 #include <string>
 
 #include "base/base64.h"
 #if !defined(OS_CHROMEOS)
@@ skipping 455 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(task.get(),
                         &PrintSystemTaskProxy::EnumeratePrinters));
 }
 
 void PrintPreviewHandler::HandleGetPreview(const ListValue* args) {
   scoped_ptr<DictionaryValue> settings(GetSettingsDictionary(args));
   if (!settings.get())
     return;
+  int request_id = -1;
+  if (!settings->GetInteger(printing::kPreviewRequestID, &request_id))
+    return;
+
+  PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(web_ui_);
+  print_preview_ui->OnPrintPreviewRequest(request_id);
+  // Add an additional key in order to identify |print_preview_ui| later on
+  // when calling PrintPreviewUI::GetCurrentPrintPreviewStatus() on the IO
+  // thread.
+  settings->SetString(printing::kPreviewUIAddr,
+                      print_preview_ui->GetPrintPreviewUIAddress());
 
   // Increment request count.
   ++regenerate_preview_request_count_;
 
-  PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(web_ui_);
-  print_preview_ui->OnPrintPreviewRequest();
-
   TabContents* initiator_tab = GetInitiatorTab();
   if (!initiator_tab) {
     if (!reported_failed_preview_) {
       ReportUserActionHistogram(PREVIEW_FAILED);
       reported_failed_preview_ = true;
     }
     print_preview_ui->OnPrintPreviewFailed();
     return;
   }
   VLOG(1) << "Print preview request start";
@@ skipping 337 matching lines @@
 }
 
 void PrintPreviewHandler::OnNavigation() {
   TabContents* initiator_tab = GetInitiatorTab();
   if (!initiator_tab)
     return;
 
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(initiator_tab);
   wrapper->print_view_manager()->set_observer(NULL);
-
-  // Tell the initiator tab to stop rendering the print preview, if any,
-  // since the preview tab is gone.
-  RenderViewHost* rvh = initiator_tab->render_view_host();
-  rvh->Send(new PrintMsg_AbortPreview(rvh->routing_id()));
 }
 
 void PrintPreviewHandler::FileSelected(const FilePath& path,
                                        int index, void* params) {
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(web_ui_);
   scoped_refptr<RefCountedBytes> data;
   print_preview_ui->GetPrintPreviewDataForIndex(
       printing::COMPLETE_PREVIEW_DOCUMENT_INDEX, &data);
   if (!data.get()) {
     NOTREACHED();
@@ skipping 31 matching lines @@
     return;
 
   // We no longer require the initiator tab details. Remove those details
   // associated with the preview tab to allow the initiator tab to create
   // another preview tab.
   printing::PrintPreviewTabController* tab_controller =
      printing::PrintPreviewTabController::GetInstance();
   if (tab_controller)
     tab_controller->EraseInitiatorTabInfo(preview_tab());
 }