Add support for multipage distillation.

components/dom_distiller/content/dom_distiller_viewer_source.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 "components/dom_distiller/content/dom_distiller_viewer_source.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
+#include "components/dom_distiller/core/proto/distilled_article.pb.h"
 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "grit/component_strings.h"
 #include "grit/dom_distiller_resources.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 21 matching lines @@
 
 // Handles receiving data asynchronously for a specific entry, and passing
 // it along to the data callback for the data source.
 class RequestViewerHandle : public ViewRequestDelegate {
  public:
   explicit RequestViewerHandle(
       const content::URLDataSource::GotDataCallback& callback);
   virtual ~RequestViewerHandle();
 
   // ViewRequestDelegate implementation.
-  virtual void OnArticleReady(DistilledPageProto* proto) OVERRIDE;
+  virtual void OnArticleReady(const DistilledArticleProto* article_proto)
+      OVERRIDE;
 
   void TakeViewerHandle(scoped_ptr<ViewerHandle> viewer_handle);
 
  private:
   // The handle to the view request towards the DomDistillerService. It
   // needs to be kept around to ensure the distillation request finishes.
   scoped_ptr<ViewerHandle> viewer_handle_;
 
   // This holds the callback to where the data retrieved is sent back.
   content::URLDataSource::GotDataCallback callback_;
 };
 
 RequestViewerHandle::RequestViewerHandle(
     const content::URLDataSource::GotDataCallback& callback)
     : callback_(callback) {}
 
 RequestViewerHandle::~RequestViewerHandle() {}
 
-void RequestViewerHandle::OnArticleReady(DistilledPageProto* proto) {
-  DCHECK(proto);
+void RequestViewerHandle::OnArticleReady(
+    const DistilledArticleProto* article_proto) {
+  DCHECK(article_proto);
   std::string title;
   std::string unsafe_article_html;
-  if (proto->has_title() && proto->has_html()) {
-    title = net::EscapeForHTML(proto->title());
-    unsafe_article_html = proto->html();
+  if (article_proto->has_title() && article_proto->pages_size() > 0 &&
+      article_proto->pages(0).has_html()) {
+    title = net::EscapeForHTML(article_proto->title());
+    // TODO(shashishekhar): Add support for displaying multiple pages after
+    // discussing
+    // the right way to display them.
+    std::stringstream unsafe_output_stream;
+    for (int page_num = 0; page_num < article_proto->pages_size(); ++page_num) {
+      unsafe_output_stream << article_proto->pages(page_num).html();
+    }
+    unsafe_article_html = unsafe_output_stream.str();
   } else {
     title = l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_NO_DATA_TITLE);
     unsafe_article_html =
         l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_NO_DATA_CONTENT);
   }
   std::string unsafe_page_html =
       ReplaceHtmlTemplateValues(title, unsafe_article_html);
   callback_.Run(base::RefCountedString::TakeString(&unsafe_page_html));
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
@@ skipping 79 matching lines @@
     *path = request->url().host();
   }
 };
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyObjectSrc()
     const {
   return "object-src 'none'; style-src 'self'";
 }
 
 }  // namespace dom_distiller