Theme Preferences for Distilled Pages

components/dom_distiller/core/viewer.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/core/viewer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.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/reader_mode_preferences.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 "grit/component_resources.h"
 #include "grit/components_strings.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"
 #include "url/gurl.h"
 
 namespace dom_distiller {
 
 namespace {
 
+// CSS class names - must agree with css/distilledpage.css.
+const char kDarkClassName[] = "dark";
+const char kLightClassName[] = "light";
+const char kSepiaClassName[] = "sepia";
+
 std::string ReplaceHtmlTemplateValues(
     const std::string& title,
     const std::string& content,
     const std::string& loading_indicator_class,
-    const std::string& original_url) {
+    const std::string& original_url,
+    const ReaderModePrefs::Theme theme) {
   base::StringPiece html_template =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_DOM_DISTILLER_VIEWER_HTML);
   std::vector<std::string> substitutions;
   substitutions.push_back(title);                                         // $1
   substitutions.push_back(kViewerCssPath);                                // $2
   substitutions.push_back(kViewerJsPath);                                 // $3
-  substitutions.push_back(title);                                         // $4
+  substitutions.push_back(viewer::GetBodyCssClass(theme));                // $4
   substitutions.push_back(content);                                       // $5
   substitutions.push_back(loading_indicator_class);                       // $6
   substitutions.push_back(
       l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_LOADING_STRING)); // $7
   substitutions.push_back(original_url);                                  // $8
   substitutions.push_back(
       l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_VIEW_ORIGINAL));  // $9
   return ReplaceStringPlaceholders(html_template, substitutions, NULL);
 }
 
@@ skipping 15 matching lines @@
 }
 
 const std::string GetToggleLoadingIndicatorJs(const bool is_last_page) {
   if (is_last_page)
     return "showLoadingIndicator(true);";
   else
     return "showLoadingIndicator(false);";
 }
 
 const std::string GetUnsafePartialArticleHtml(
-    const DistilledPageProto* page_proto) {
+    const DistilledPageProto* page_proto,
+    const ReaderModePrefs::Theme theme) {
   DCHECK(page_proto);
   std::string title = net::EscapeForHTML(page_proto->title());
   std::ostringstream unsafe_output_stream;
   unsafe_output_stream << page_proto->html();
   std::string unsafe_article_html = unsafe_output_stream.str();
   std::string original_url = page_proto->url();
   return ReplaceHtmlTemplateValues(title,
                                    unsafe_article_html,
                                    "visible",
-                                   original_url);
+                                   original_url,
+                                   theme);
 }
 
 const std::string GetUnsafeArticleHtml(
-    const DistilledArticleProto* article_proto) {
+    const DistilledArticleProto* article_proto,
+    const ReaderModePrefs::Theme theme) {
   DCHECK(article_proto);
   std::string title;
   std::string unsafe_article_html;
   if (article_proto->has_title() && article_proto->pages_size() > 0 &&
       article_proto->pages(0).has_html()) {
     title = net::EscapeForHTML(article_proto->title());
     std::ostringstream 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 original_url;
   if (article_proto->pages_size() > 0 && article_proto->pages(0).has_url()) {
     original_url = article_proto->pages(0).url();
   }
 
   return ReplaceHtmlTemplateValues(title,
                                    unsafe_article_html,
                                    "hidden",
-                                   original_url);
+                                   original_url,
+                                   theme);
 }
 
-const std::string GetErrorPageHtml() {
+const std::string GetErrorPageHtml(const ReaderModePrefs::Theme theme) {
   std::string title = l10n_util::GetStringUTF8(
       IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_TITLE);
   std::string content = l10n_util::GetStringUTF8(
       IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_CONTENT);
-  return ReplaceHtmlTemplateValues(title, content, "hidden", "");
+  return ReplaceHtmlTemplateValues(title, content, "hidden", "", theme);
 }
 
 const std::string GetCss() {
-  return ResourceBundle::GetSharedInstance()
-      .GetRawDataResource(IDR_DISTILLER_CSS)
-      .as_string();
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+          IDR_DISTILLER_CSS).as_string();
 }
 
 const std::string GetJavaScript() {
   return ResourceBundle::GetSharedInstance()
       .GetRawDataResource(IDR_DOM_DISTILLER_VIEWER_JS)
       .as_string();
 }
 
 scoped_ptr<ViewerHandle> CreateViewRequest(
     DomDistillerServiceInterface* dom_distiller_service,
@@ skipping 24 matching lines @@
     return dom_distiller_service->ViewUrl(view_request_delegate,
                                           dom_distiller_service
                                               ->CreateDefaultDistillerPage(),
                                           requested_url).Pass();
   }
 
   // It is invalid to not specify a query param for |kEntryIdKey| or |kUrlKey|.
   return scoped_ptr<ViewerHandle>();
 }
 
+const char* GetBodyCssClass(ReaderModePrefs::Theme theme) {

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

I guess this could be added a unittest for?

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

Done.

+  if (theme == ReaderModePrefs::Theme::kDark) {
+    return kDarkClassName;
+  } else if (theme == ReaderModePrefs::Theme::kSepia) {
+    return kSepiaClassName;
+  } else {
+    return kLightClassName;

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

Remove the else block and just return kLightClassName unindented.

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

Done.

+  }
+}
+
 }  // namespace viewer
 
 }  // namespace dom_distiller