Theme Preferences for Distilled Pages

components/dom_distiller/core/viewer.h

Index: components/dom_distiller/core/viewer.h
diff --git a/components/dom_distiller/core/viewer.h b/components/dom_distiller/core/viewer.h
index 98a7e998f8ebbd2e0028ffca808b50ef4c16078e..cf40736b55e4eb6ae1d7c65e568ef6a38b0c4830 100644
--- a/components/dom_distiller/core/viewer.h
+++ b/components/dom_distiller/core/viewer.h
@@ -11,6 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "components/dom_distiller/core/reader_mode_preferences.h"

[nyquist, 2014/06/27 20:48:27]

Can you instead forward declare this in the header and move the include to the
.cc file?

[smaslo, 2014/06/30 17:57:15]

The compiler doesn't allow forward declarations of enums and I need the Theme
enum.

On 2014/06/27 20:48:27, nyquist wrote:

 
 namespace dom_distiller {
 
@@ -26,7 +27,8 @@ namespace viewer {
 // to be displayed to the end user. The returned HTML should be considered
 // unsafe, so callers must ensure rendering it does not compromise Chrome.
 const std::string GetUnsafeArticleHtml(
-    const DistilledArticleProto* article_proto);
+    const DistilledArticleProto* article_proto,
+    const ReaderModePrefs::Theme theme);
 
 // Returns the base Viewer HTML page based on the given |page_proto|. This is
 // supposed to be displayed to the end user. The returned HTML should be
@@ -35,7 +37,7 @@ const std::string GetUnsafeArticleHtml(
 // for displaying an in-flight distillation instead of waiting for the full
 // article.
 const std::string GetUnsafePartialArticleHtml(
-    const DistilledPageProto* page_proto);
+    const DistilledPageProto* page_proto, const ReaderModePrefs::Theme theme);
 
 // Returns a JavaScript blob for updating a partial view request with additional
 // distilled content. Meant for use when viewing a slow or long multi-page
@@ -51,7 +53,7 @@ const std::string GetUnsafeIncrementalDistilledPageJs(
 const std::string GetToggleLoadingIndicatorJs(const bool is_last_page);
 
 // Returns a full HTML page which displays a generic error.
-const std::string GetErrorPageHtml();
+const std::string GetErrorPageHtml(const ReaderModePrefs::Theme theme);
 
 // Returns the default CSS to be used for a viewer.
 const std::string GetCss();
@@ -66,6 +68,9 @@ scoped_ptr<ViewerHandle> CreateViewRequest(
     const std::string& path,
     ViewRequestDelegate* view_request_delegate);
 
+// Returns the corresponding CSS class
+const char* GetBodyCssClass(ReaderModePrefs::Theme theme);

[nyquist, 2014/06/27 20:48:27]

Could this return std::string? Also can this be const? I don't think it changes
anything (add const before the ; )

[smaslo, 2014/06/30 17:57:15]

Made std::string, but couldn't make it const.  I tried to make it const but got
a compiler error since it is not a member function.

+
 }  // namespace viewer
 
 }  // namespace dom_distiller