Show template before distiller finishes

components/dom_distiller/core/dom_distiller_request_view_base.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_REQUEST_VIEW_BASE_H_
 #define COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_REQUEST_VIEW_BASE_H_
 
 #include <sstream>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/dom_distiller/core/distilled_page_prefs.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "components/dom_distiller/core/viewer.h"
 #include "content/public/browser/url_data_source.h"
 #include "net/base/url_util.h"
 
 namespace dom_distiller {
 
-// This interface is used to abstract the data callback from the distiller. The
-// callbacks for different platforms have different numbers of parameters
-// (namely iOS and Android) which makes this necessary.
-class DistillerDataCallback {
- public:
-  virtual ~DistillerDataCallback(){};
-  virtual void RunCallback(std::string& data) = 0;
-};
-
 // Handles receiving data asynchronously for a specific entry, and passing
 // it along to the data callback for the data source. Lifetime matches that of
 // the current main frame's page in the Viewer instance.
-class DomDistillerRequestViewBase
-    : public ViewRequestDelegate,
-      public DistilledPagePrefs::Observer {
+class DomDistillerRequestViewBase : public ViewRequestDelegate,
+                                    public DistilledPagePrefs::Observer {
  public:
   explicit DomDistillerRequestViewBase(
-      scoped_ptr<DistillerDataCallback> callback,
       DistilledPagePrefs* distilled_page_prefs);
   ~DomDistillerRequestViewBase() override;
 
   // Flag this request as an error and send the error page template.
   void FlagAsErrorPage();
   // Get if this viewer is in an error state.
   bool IsErrorPage();
 
   // ViewRequestDelegate implementation:
   void OnArticleReady(const DistilledArticleProto* article_proto) override;
 
   void OnArticleUpdated(ArticleDistillationUpdate article_update) override;
 
   void TakeViewerHandle(scoped_ptr<ViewerHandle> viewer_handle);
 
  protected:
   // DistilledPagePrefs::Observer implementation:
   void OnChangeFontFamily(
       DistilledPagePrefs::FontFamily new_font_family) override;
   void OnChangeTheme(DistilledPagePrefs::Theme new_theme) override;
 
   // Sends JavaScript to the attached Viewer, buffering data if the viewer isn't
   // ready.
   virtual void SendJavaScript(const std::string& buffer) = 0;
 
   // 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_;
 
-  // Holds the callback to where the data retrieved is sent back.
-  scoped_ptr<DistillerDataCallback> callback_;
-
   // Number of pages of the distilled article content that have been rendered by
   // the viewer.
   int page_count_;
 
   // Interface for accessing preferences for distilled pages.
   DistilledPagePrefs* distilled_page_prefs_;
 
   // Flag to tell this observer that the web contents are in an error state.
   bool is_error_page_;
 };
 
 }  // namespace dom_distiller
 
 #endif  // COMPONENTS_DOM_DISTILLER_CORE_DOM_DISTILLER_REQUEST_VIEW_BASE_H_