Add a "Simplify Page" option to the print preview dialog

chrome/browser/dom_distiller/tab_utils.cc

 // Copyright 2014 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/dom_distiller/tab_utils.h"
 
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "components/dom_distiller/content/distiller_page_web_contents.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace {
 
 using dom_distiller::ViewRequestDelegate;
 using dom_distiller::DistilledArticleProto;
 using dom_distiller::ArticleDistillationUpdate;
 using dom_distiller::ViewerHandle;
-using dom_distiller::SourcePageHandleWebContents;
+using dom_distiller::SourcePageHandleWebContentsWeakPtr;
 using dom_distiller::DomDistillerService;
 using dom_distiller::DomDistillerServiceFactory;
 using dom_distiller::DistillerPage;
-using dom_distiller::SourcePageHandle;
 
 // An no-op ViewRequestDelegate which holds a ViewerHandle and deletes itself
 // after the WebContents navigates or goes away. This class is a band-aid to
 // keep a TaskTracker around until the distillation starts from the viewer.
 class SelfDeletingRequestDelegate : public ViewRequestDelegate,
                                     public content::WebContentsObserver {
  public:
   explicit SelfDeletingRequestDelegate(content::WebContents* web_contents);
   ~SelfDeletingRequestDelegate() override;
 
@@ skipping 60 matching lines @@
 // Start loading the viewer URL of the current page in |web_contents|.
 void StartNavigationToDistillerViewer(content::WebContents* web_contents,
                                       const GURL& url) {
   GURL viewer_url = dom_distiller::url_utils::GetDistillerViewUrlFromUrl(
       dom_distiller::kDomDistillerScheme, url);
   content::NavigationController::LoadURLParams params(viewer_url);
   params.transition_type = ui::PAGE_TRANSITION_AUTO_BOOKMARK;
   web_contents->GetController().LoadURLWithParams(params);
 }
 
+}  // namespace
+
 void MaybeStartDistillation(content::WebContents* web_contents) {
   const GURL& last_committed_url = web_contents->GetLastCommittedURL();
-  if (!dom_distiller::url_utils::IsUrlDistillable(last_committed_url)) {
-    delete web_contents;
+  if (!dom_distiller::url_utils::IsUrlDistillable(last_committed_url))
     return;
-  }
 
   // Start distillation using |web_contents|, and ensure ViewerHandle stays
   // around until the viewer requests distillation.
   SelfDeletingRequestDelegate* view_request_delegate =
       new SelfDeletingRequestDelegate(web_contents);
-  scoped_ptr<content::WebContents> old_web_contents_sptr(web_contents);
-  scoped_ptr<SourcePageHandleWebContents> source_page_handle(
-      new SourcePageHandleWebContents(old_web_contents_sptr.Pass()));
+  scoped_ptr<SourcePageHandleWebContentsWeakPtr> source_page_handle(
+      new SourcePageHandleWebContentsWeakPtr(web_contents));
   DomDistillerService* dom_distiller_service =
       DomDistillerServiceFactory::GetForBrowserContext(
           web_contents->GetBrowserContext());
   scoped_ptr<DistillerPage> distiller_page =
       dom_distiller_service->CreateDefaultDistillerPageWithHandle(
                                  source_page_handle.Pass()).Pass();
 
   scoped_ptr<ViewerHandle> viewer_handle = dom_distiller_service->ViewUrl(
       view_request_delegate, distiller_page.Pass(), last_committed_url);
   view_request_delegate->TakeViewerHandle(viewer_handle.Pass());
 }
 
-}  // namespace
-
-void DistillCurrentPageAndView(content::WebContents* old_web_contents) {
-  DCHECK(old_web_contents);
+void DistillCurrentPageAndView(content::WebContents* web_contents) {
+  DCHECK(web_contents);
   // Create new WebContents.
   content::WebContents::CreateParams create_params(
-      old_web_contents->GetBrowserContext());
-  content::WebContents* new_web_contents =
-      content::WebContents::Create(create_params);
-  DCHECK(new_web_contents);
+      web_contents->GetBrowserContext());
 
-  // Copy all navigation state from the old WebContents to the new one.
-  new_web_contents->GetController().CopyStateFrom(
-      old_web_contents->GetController());
+  MaybeStartDistillation(web_contents);
 
-  // StartNavigationToDistillerViewer must come before swapping the tab contents
-  // to avoid triggering a reload of the page.  This reloadmakes it very
-  // difficult to distinguish between the intermediate reload and a user hitting
-  // the back button.
-  StartNavigationToDistillerViewer(new_web_contents,
-                                   old_web_contents->GetLastCommittedURL());
-
-  CoreTabHelper::FromWebContents(old_web_contents)->delegate()->SwapTabContents(
-      old_web_contents, new_web_contents, false, false);
-
-  MaybeStartDistillation(old_web_contents);
+  StartNavigationToDistillerViewer(web_contents,
+                                   web_contents->GetLastCommittedURL());
 }