base::Bind: Convert (again) chrome/browser/printing.

BUG=none
TEST=none

R=csilv@chromium.org,thestig@chromium.org

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

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

3 files changed, 47 insertions, 81 deletions

diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
index 4cdee538..b7ebbeb 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -33,36 +33,17 @@ void HoldRefCallback(const scoped_refptr<printing::PrintJobWorkerOwner>& owner,
 
 namespace printing {
 
-class PrintJobWorker::NotificationTask : public Task {
- public:
-  NotificationTask() : print_job_(NULL), details_(NULL) {}
-  ~NotificationTask() {}
-
-  // Initializes the object. This object can't be initialized in the constructor
-  // since it is not created directly.
-  void Init(PrintJobWorkerOwner* print_job,
-            JobEventDetails::Type detail_type,
-            PrintedDocument* document,
-            PrintedPage* page) {
-    DCHECK(!print_job_);
-    DCHECK(!details_);
-    print_job_ = print_job;
-    details_ = new JobEventDetails(detail_type, document, page);
-  }
-
-  virtual void Run() {
-    // Send the notification in the right thread.
-    content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_PRINT_JOB_EVENT,
-        // We know that is is a PrintJob object in this circumstance.
-        content::Source<PrintJob>(static_cast<PrintJob*>(print_job_.get())),
-        content::Details<JobEventDetails>(details_));
-  }
-
-  // The job which originates this notification.
-  scoped_refptr<PrintJobWorkerOwner> print_job_;
-  scoped_refptr<JobEventDetails> details_;
-};
+void NotificationCallback(PrintJobWorkerOwner* print_job,
+                          JobEventDetails::Type detail_type,
+                          PrintedDocument* document,
+                          PrintedPage* page) {
+  JobEventDetails* details = new JobEventDetails(detail_type, document, page);
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_PRINT_JOB_EVENT,
+      // We know that is is a PrintJob object in this circumstance.
+      content::Source<PrintJob>(static_cast<PrintJob*>(print_job)),
+      content::Details<JobEventDetails>(details));
+}
 
 PrintJobWorker::PrintJobWorker(PrintJobWorkerOwner* owner)
     : Thread("Printing_Worker"),
@@ -275,7 +256,7 @@ void PrintJobWorker::OnNewPage() {
       break;
     }
     // The page is there, print it.
-    SpoolPage(*page);
+    SpoolPage(page);
     ++page_number_;
     if (page_number_ == PageNumber::npos()) {
       OnDocumentDone();
@@ -302,29 +283,24 @@ void PrintJobWorker::OnDocumentDone() {
     return;
   }
 
-  // Tell everyone!
-  NotificationTask* task = new NotificationTask();
-  task->Init(owner_,
-             JobEventDetails::DOC_DONE,
-             document_.get(),
-             NULL);
-  owner_->message_loop()->PostTask(FROM_HERE, task);
+  owner_->message_loop()->PostTask(
+      FROM_HERE, base::Bind(NotificationCallback, make_scoped_refptr(owner_),
+                            JobEventDetails::DOC_DONE, document_,
+                            scoped_refptr<PrintedPage>()));
 
   // Makes sure the variables are reinitialized.
   document_ = NULL;
 }
 
-void PrintJobWorker::SpoolPage(PrintedPage& page) {
+void PrintJobWorker::SpoolPage(PrintedPage* page) {
   DCHECK_EQ(message_loop(), MessageLoop::current());
   DCHECK_NE(page_number_, PageNumber::npos());
 
   // Signal everyone that the page is about to be printed.
-  NotificationTask* task = new NotificationTask();
-  task->Init(owner_,
-             JobEventDetails::NEW_PAGE,
-             document_.get(),
-             &page);
-  owner_->message_loop()->PostTask(FROM_HERE, task);
+  owner_->message_loop()->PostTask(
+      FROM_HERE, base::Bind(NotificationCallback, make_scoped_refptr(owner_),
+                            JobEventDetails::NEW_PAGE, document_,
+                            make_scoped_refptr(page)));
 
   // Preprocess.
   if (printing_context_->NewPage() != PrintingContext::OK) {
@@ -334,9 +310,9 @@ void PrintJobWorker::SpoolPage(PrintedPage& page) {
 
   // Actual printing.
 #if defined(OS_WIN) || defined(OS_MACOSX)
-  document_->RenderPrintedPage(page, printing_context_->context());
+  document_->RenderPrintedPage(*page, printing_context_->context());
 #elif defined(OS_POSIX)
-  document_->RenderPrintedPage(page, printing_context_.get());
+  document_->RenderPrintedPage(*page, printing_context_.get());
 #endif
 
   // Postprocess.
@@ -346,12 +322,11 @@ void PrintJobWorker::SpoolPage(PrintedPage& page) {
   }
 
   // Signal everyone that the page is printed.
-  task = new NotificationTask();
-  task->Init(owner_,
-             JobEventDetails::PAGE_DONE,
-             document_.get(),
-             &page);
-  owner_->message_loop()->PostTask(FROM_HERE, task);
+  owner_->message_loop()->PostTask(
+      FROM_HERE,
+      base::Bind(NotificationCallback, make_scoped_refptr(owner_),
+                 JobEventDetails::PAGE_DONE, document_,
+                 make_scoped_refptr(page)));
 }
 
 void PrintJobWorker::OnFailure() {
@@ -360,12 +335,10 @@ void PrintJobWorker::OnFailure() {
   // We may loose our last reference by broadcasting the FAILED event.
   scoped_refptr<PrintJobWorkerOwner> handle(owner_);
 
-  NotificationTask* task = new NotificationTask();
-  task->Init(owner_,
-             JobEventDetails::FAILED,
-             document_.get(),
-             NULL);
-  owner_->message_loop()->PostTask(FROM_HERE, task);
+  owner_->message_loop()->PostTask(
+      FROM_HERE, base::Bind(NotificationCallback, make_scoped_refptr(owner_),
+                            JobEventDetails::FAILED, document_,
+                            scoped_refptr<PrintedPage>()));
   Cancel();
 
   // Makes sure the variables are reinitialized.
diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h
index 67bff08..cfbae62 100644
--- a/chrome/browser/printing/print_job_worker.h
+++ b/chrome/browser/printing/print_job_worker.h
@@ -80,7 +80,7 @@ class PrintJobWorker : public base::Thread {
   class NotificationTask;
 
   // Renders a page in the printer.
-  void SpoolPage(PrintedPage& page);
+  void SpoolPage(PrintedPage* page);
 
   // Closes the job since spooling is done.
   void OnDocumentDone();
diff --git a/chrome/browser/printing/printer_manager_dialog_win.cc b/chrome/browser/printing/printer_manager_dialog_win.cc
index 5485019..8c94d07 100644
--- a/chrome/browser/printing/printer_manager_dialog_win.cc
+++ b/chrome/browser/printing/printer_manager_dialog_win.cc
@@ -7,6 +7,7 @@
 #include <windows.h>
 #include <shellapi.h>
 
+#include "base/bind.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
@@ -14,30 +15,22 @@
 
 namespace printing {
 
-// A helper method that opens the printer management dialog.
-class OpenPrintersDialogTask : public Task {
- public:
-  OpenPrintersDialogTask() {}
-
-  virtual void Run() {
-    FilePath sys_dir;
-    PathService::Get(base::DIR_SYSTEM, &sys_dir);
-    FilePath rundll32 = sys_dir.AppendASCII("rundll32.exe");
-    FilePath shell32dll = sys_dir.AppendASCII("shell32.dll");
-
-    std::wstring args(shell32dll.value());
-    args.append(L",SHHelpShortcuts_RunDLL PrintersFolder");
-    ShellExecute(NULL, L"open", rundll32.value().c_str(), args.c_str(), NULL,
-                 SW_SHOWNORMAL);
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(OpenPrintersDialogTask);
-};
+// A helper callback that opens the printer management dialog.
+void OpenPrintersDialogCallback() {
+  FilePath sys_dir;
+  PathService::Get(base::DIR_SYSTEM, &sys_dir);
+  FilePath rundll32 = sys_dir.AppendASCII("rundll32.exe");
+  FilePath shell32dll = sys_dir.AppendASCII("shell32.dll");
+
+  std::wstring args(shell32dll.value());
+  args.append(L",SHHelpShortcuts_RunDLL PrintersFolder");
+  ShellExecute(NULL, L"open", rundll32.value().c_str(), args.c_str(), NULL,
+               SW_SHOWNORMAL);
+}
 
 void PrinterManagerDialog::ShowPrinterManagerDialog() {
   g_browser_process->file_thread()->message_loop()->PostTask(
-      FROM_HERE, new OpenPrintersDialogTask);
+      FROM_HERE, base::Bind(OpenPrintersDialogCallback));
 }
 
 }  // namespace printing