Theme Preferences for Distilled Pages

components/dom_distiller/content/dom_distiller_viewer_source.h

 // Copyright 2014 The Chromium Authors. All rights reserved.

[nyquist, 2014/06/26 20:39:58]

It seems like this file contains only stray changes. Please revert back to
original.

[smaslo, 2014/06/27 18:33:17]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_DOM_DISTILLER_CONTENT_DOM_DISTILLER_VIEWER_SOURCE_H_
 #define COMPONENTS_DOM_DISTILLER_CONTENT_DOM_DISTILLER_VIEWER_SOURCE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "components/dom_distiller/core/reader_mode_preferences.h"

[nyquist, 2014/06/26 20:39:58]

Remove.

[smaslo, 2014/06/27 18:33:17]

Done.

 #include "content/public/browser/url_data_source.h"
 
 namespace dom_distiller {
 
 class DomDistillerServiceInterface;
 class DomDistillerViewerSourceTest;
 class ViewerHandle;
 class ViewRequestDelegate;
 
 // Serves HTML and resources for viewing distilled articles.
-class DomDistillerViewerSource : public content::URLDataSource {
+class DomDistillerViewerSource
+    : public content::URLDataSource {

[nyquist, 2014/06/26 20:39:58]

Could this be on one line?

[smaslo, 2014/06/27 18:33:17]

Done.

  public:
   DomDistillerViewerSource(DomDistillerServiceInterface* dom_distiller_service,
                            const std::string& scheme);
   virtual ~DomDistillerViewerSource();
 
   class RequestViewerHandle;
 
   // Overridden from content::URLDataSource:
   virtual std::string GetSource() const OVERRIDE;
   virtual void StartDataRequest(
       const std::string& path,
       int render_process_id,
       int render_frame_id,
       const content::URLDataSource::GotDataCallback& callback) OVERRIDE;
   virtual std::string GetMimeType(const std::string& path) const OVERRIDE;
   virtual bool ShouldServiceRequest(
       const net::URLRequest* request) const OVERRIDE;
   virtual void WillServiceRequest(const net::URLRequest* request,
                                   std::string* path) const OVERRIDE;
   virtual std::string GetContentSecurityPolicyObjectSrc() const OVERRIDE;
 
+

[nyquist, 2014/06/26 20:39:58]

Is this needed?

[smaslo, 2014/06/27 18:33:17]

Done.

  private:
   friend class DomDistillerViewerSourceTest;
 
   // The scheme this URLDataSource is hosted under.
   std::string scheme_;
 
   // The service which contains all the functionality needed to interact with
   // the list of articles.
   DomDistillerServiceInterface* dom_distiller_service_;
 
   DISALLOW_COPY_AND_ASSIGN(DomDistillerViewerSource);
 };
 
 }  // namespace dom_distiller
 
 #endif  // COMPONENTS_DOM_DISTILLER_CONTENT_DOM_DISTILLER_VIEWER_SOURCE_H_