Printing: Keep track of WebContents lifetime for the native printing UI.

chrome/browser/printing/printer_query.cc

 // Copyright (c) 2012 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/printer_query.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "chrome/browser/printing/print_job_worker.h"
+#include "chrome/browser/printing/printing_ui_web_contents_observer.h"
 
 namespace printing {
 
 PrinterQuery::PrinterQuery()
     : io_message_loop_(base::MessageLoop::current()),
       worker_(new PrintJobWorker(this)),
       is_print_dialog_box_shown_(false),
       cookie_(PrintSettings::NewCookie()),
       last_status_(PrintingContext::FAILED) {
   DCHECK_EQ(io_message_loop_->type(), base::MessageLoop::TYPE_IO);
@@ skipping 38 matching lines @@
 }
 
 const PrintSettings& PrinterQuery::settings() const {
   return settings_;
 }
 
 int PrinterQuery::cookie() const {
   return cookie_;
 }
 
-void PrinterQuery::GetSettings(GetSettingsAskParam ask_user_for_settings,
-                               gfx::NativeView parent_view,
-                               int expected_page_count,
-                               bool has_selection,
-                               MarginType margin_type,
-                               const base::Closure& callback) {
+void PrinterQuery::GetSettings(
+    GetSettingsAskParam ask_user_for_settings,
+    scoped_ptr<PrintingUIWebContentsObserver> web_contents_observer,
+    int expected_page_count,
+    bool has_selection,
+    MarginType margin_type,
+    const base::Closure& callback) {
   DCHECK_EQ(io_message_loop_, base::MessageLoop::current());
   DCHECK(!is_print_dialog_box_shown_);
 
   StartWorker(callback);
 
   // Real work is done in PrintJobWorker::Init().
   is_print_dialog_box_shown_ = ask_user_for_settings == ASK_USER;
   worker_->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&PrintJobWorker::GetSettings,
                  base::Unretained(worker_.get()),
-                 is_print_dialog_box_shown_, parent_view,
-                 expected_page_count, has_selection, margin_type));
+                 is_print_dialog_box_shown_,
+                 base::Passed(&web_contents_observer),
+                 expected_page_count,
+                 has_selection,
+                 margin_type));
 }
 
 void PrinterQuery::SetSettings(const DictionaryValue& new_settings,
                                const base::Closure& callback) {
   StartWorker(callback);
 
   worker_->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&PrintJobWorker::SetSettings,
                  base::Unretained(worker_.get()),
@@ skipping 29 matching lines @@
 
 bool PrinterQuery::is_callback_pending() const {
   return !callback_.is_null();
 }
 
 bool PrinterQuery::is_valid() const {
   return worker_.get() != NULL;
 }
 
 }  // namespace printing