Linux: Simplify printing code and make it more reliable during shutdown.

BUG=84992
TEST=printing still works.

Review URL: http://codereview.chromium.org/7639014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96672 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 24 insertions, 58 deletions

diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
index a3d00a8..6457ce0 100644
--- a/chrome/browser/printing/print_dialog_gtk.cc
+++ b/chrome/browser/printing/print_dialog_gtk.cc
@@ -16,7 +16,6 @@
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
-#include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ -133,7 +132,6 @@ PrintDialogGtk::~PrintDialogGtk() {
 }
 
 void PrintDialogGtk::UseDefaultSettings() {
-  DCHECK(!save_document_event_.get());
   DCHECK(!page_setup_);
 
   // |gtk_settings_| is a new object.
@@ -216,8 +214,6 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& settings,
 
 void PrintDialogGtk::ShowDialog(
     PrintingContextCairo::PrintSettingsCallback* callback) {
-  DCHECK(!save_document_event_.get());
-
   callback_ = callback;
 
   GtkWindow* parent = BrowserList::GetLastActive()->window()->GetNativeHandle();
@@ -256,17 +252,30 @@ void PrintDialogGtk::PrintDocument(const printing::Metafile* metafile,
   // The document printing tasks can outlive the PrintingContext that created
   // this dialog.
   AddRef();
-  DCHECK(!save_document_event_.get());
-  save_document_event_.reset(new base::WaitableEvent(false, false));
-
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      NewRunnableMethod(this,
-                        &PrintDialogGtk::SaveDocumentToDisk,
-                        metafile,
-                        document_name));
-  // Wait for SaveDocumentToDisk() to finish.
-  save_document_event_->Wait();
+
+  bool error = false;
+  if (!file_util::CreateTemporaryFile(&path_to_pdf_)) {
+    LOG(ERROR) << "Creating temporary file failed";
+    error = true;
+  }
+
+  if (!error && !metafile->SaveTo(path_to_pdf_)) {
+    LOG(ERROR) << "Saving metafile failed";
+    file_util::Delete(path_to_pdf_, false);
+    error = true;
+  }
+
+  if (error) {
+    // Matches AddRef() above.
+    Release();
+  } else {
+    // No errors, continue printing.
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        NewRunnableMethod(this,
+                          &PrintDialogGtk::SendDocumentToPrinter,
+                          document_name));
+  }
 }
 
 void PrintDialogGtk::AddRefToDialog() {
@@ -335,38 +344,6 @@ void PrintDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
   }
 }
 
-void PrintDialogGtk::SaveDocumentToDisk(const printing::Metafile* metafile,
-                                        const string16& document_name) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
-  bool error = false;
-  if (!file_util::CreateTemporaryFile(&path_to_pdf_)) {
-    LOG(ERROR) << "Creating temporary file failed";
-    error = true;
-  }
-
-  if (!error && !metafile->SaveTo(path_to_pdf_)) {
-    LOG(ERROR) << "Saving metafile failed";
-    file_util::Delete(path_to_pdf_, false);
-    error = true;
-  }
-
-  // Done saving, let PrintDialogGtk::PrintDocument() continue.
-  save_document_event_->Signal();
-
-  if (error) {
-    // Matches AddRef() in PrintDocument();
-    Release();
-  } else {
-    // No errors, continue printing.
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        NewRunnableMethod(this,
-                          &PrintDialogGtk::SendDocumentToPrinter,
-                          document_name));
-  }
-}
-
 void PrintDialogGtk::SendDocumentToPrinter(const string16& document_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
diff --git a/chrome/browser/printing/print_dialog_gtk.h b/chrome/browser/printing/print_dialog_gtk.h
index af082d6..774fda4 100644
--- a/chrome/browser/printing/print_dialog_gtk.h
+++ b/chrome/browser/printing/print_dialog_gtk.h
@@ -17,10 +17,6 @@
 #include "printing/printing_context_cairo.h"
 #include "ui/base/gtk/gtk_signal.h"
 
-namespace base {
-class WaitableEvent;
-}
-
 namespace printing {
 class Metafile;
 }
@@ -58,10 +54,6 @@ class PrintDialogGtk
   // Handles dialog response.
   CHROMEGTK_CALLBACK_1(PrintDialogGtk, void, OnResponse, int);
 
-  // Saves data in |metafile| to disk for document named |document_name|.
-  void SaveDocumentToDisk(const printing::Metafile* metafile,
-                          const string16& document_name);
-
   // Prints document named |document_name|.
   void SendDocumentToPrinter(const string16& document_name);
 
@@ -86,9 +78,6 @@ class PrintDialogGtk
   GtkPageSetup* page_setup_;
   GtkPrinter* printer_;
 
-  // Event to signal when save document finishes.
-  scoped_ptr<base::WaitableEvent> save_document_event_;
-
   FilePath path_to_pdf_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintDialogGtk);