Removed redundant PrintingUIWebContentsObserver.

chrome/browser/printing/print_job_worker.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/print_job_worker.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/printing/print_job.h"
-#include "chrome/browser/printing/printing_ui_web_contents_observer.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "printing/print_job_constants.h"
 #include "printing/printed_document.h"
 #include "printing/printed_page.h"
 #include "printing/printing_utils.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 12 matching lines @@
 
 class PrintingContextDelegate : public PrintingContext::Delegate {
  public:
   PrintingContextDelegate(int render_process_id, int render_view_id);
   virtual ~PrintingContextDelegate();
 
   virtual gfx::NativeView GetParentView() OVERRIDE;
   virtual std::string GetAppLocale() OVERRIDE;
 
  private:
-  void InitOnUiThread(int render_process_id, int render_view_id);
-
-  scoped_ptr<PrintingUIWebContentsObserver> web_contents_observer_;
+  int render_process_id_;
+  int render_view_id_;
   base::WeakPtrFactory<PrintingContextDelegate> weak_ptr_factory_;
 };
 
 PrintingContextDelegate::PrintingContextDelegate(int render_process_id,
                                                  int render_view_id)
-    : weak_ptr_factory_(this) {
-  InitOnUiThread(render_process_id, render_view_id);
+    : weak_ptr_factory_(this),
+      render_process_id_(render_process_id),
+      render_view_id_(render_view_id) {
 }
 
 PrintingContextDelegate::~PrintingContextDelegate() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);

[Noam Samuel, 2014/08/26 21:09:30]

Have DCHECK for new thread if it matters?

[Vitaly Buka (NO REVIEWS), 2014/08/26 21:12:24]

web_contents_observer_ was the reason we wanted delete this on UI thread.

 }
 
 gfx::NativeView PrintingContextDelegate::GetParentView() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (!web_contents_observer_)
+  content::RenderViewHost* view =
+      content::RenderViewHost::FromID(render_process_id_, render_view_id_);
+  if (!view)
     return NULL;
-  return web_contents_observer_->GetParentView();
+  content::WebContents* wc = content::WebContents::FromRenderViewHost(view);
+  return wc ? wc->GetNativeView() : NULL;
 }
 
 std::string PrintingContextDelegate::GetAppLocale() {
   return g_browser_process->GetApplicationLocale();
 }
 
-void PrintingContextDelegate::InitOnUiThread(int render_process_id,
-                                             int render_view_id) {
-  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    // All data initialized here should be accessed on UI thread. Because object
-    // is being constructed now, anything that is going to access
-    // PrintingContextDelegate on UI thread would be scheduled after the tasks
-    // below.
-    BrowserThread::PostTask(BrowserThread::UI,
-                            FROM_HERE,
-                            base::Bind(&PrintingContextDelegate::InitOnUiThread,
-                                       weak_ptr_factory_.GetWeakPtr(),
-                                       render_process_id,
-                                       render_view_id));
-    return;
-  }
-  content::RenderViewHost* view =
-      content::RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!view)
-    return;
-  content::WebContents* wc = content::WebContents::FromRenderViewHost(view);
-  if (!wc)
-    return;
-  web_contents_observer_.reset(new PrintingUIWebContentsObserver(wc));
-}
-
 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));
@@ skipping 337 matching lines @@
                               document_,
                               scoped_refptr<PrintedPage>()));
   Cancel();
 
   // Makes sure the variables are reinitialized.
   document_ = NULL;
   page_number_ = PageNumber::npos();
 }
 
 }  // namespace printing