Font Family Preferences for Distilled Pages

components/dom_distiller/core/viewer.cc

Index: components/dom_distiller/core/viewer.cc
diff --git a/components/dom_distiller/core/viewer.cc b/components/dom_distiller/core/viewer.cc
index be8463a3c67866bf2fc7a5efab6a58335f26232d..3d88c655ad5d0ab19f80a0859a70c738098b8c95 100644
--- a/components/dom_distiller/core/viewer.cc
+++ b/components/dom_distiller/core/viewer.cc
@@ -34,11 +34,21 @@ const char kDarkJsTheme[] = "dark";
 const char kLightJsTheme[] = "light";
 const char kSepiaJsTheme[] = "sepia";
 
-// CSS classes.  Must agree with classes in distilledpage.css.
+// CSS Theme classes.  Must agree with classes in distilledpage.css.
 const char kDarkCssClass[] = "dark";
 const char kLightCssClass[] = "light";
 const char kSepiaCssClass[] = "sepia";
 
+// JS FontFamilies. Must agree with useFontFamily() in dom_distiller_viewer.js.
+const char kSerifJsFontFamily[] = "serif";
+const char kSansSerifJsFontFamily[] = "sans-serif";
+const char kMonospaceJsFontFamily[] = "monospace";
+
+// CSS FontFamily classes.  Must agree with classes in distilledpage.css.
+const char kSerifCssClass[] = "serif";
+const char kSansSerifCssClass[] = "sans-serif";
+const char kMonospaceCssClass[] = "monospace";
+
 // Maps themes to JS themes.
 const std::string GetJsTheme(DistilledPagePrefs::Theme theme) {
   if (theme == DistilledPagePrefs::DARK) {
@@ -50,7 +60,7 @@ const std::string GetJsTheme(DistilledPagePrefs::Theme theme) {
 }
 
 // Maps themes to CSS classes.
-const std::string GetCssClass(DistilledPagePrefs::Theme theme) {
+const std::string GetThemeCssClass(DistilledPagePrefs::Theme theme) {
   if (theme == DistilledPagePrefs::DARK) {
     return kDarkCssClass;
   } else if (theme == DistilledPagePrefs::SEPIA) {
@@ -59,12 +69,33 @@ const std::string GetCssClass(DistilledPagePrefs::Theme theme) {
   return kLightCssClass;
 }
 
+// Maps font families to JS font families.
+const std::string GetJsFontFamily(DistilledPagePrefs::FontFamily font_family) {
+  if (font_family == DistilledPagePrefs::SERIF) {
+    return kSerifJsFontFamily;
+  } else if (font_family == DistilledPagePrefs::MONOSPACE) {
+    return kMonospaceJsFontFamily;
+  }
+  return kSansSerifJsFontFamily;
+}
+
+// Maps fontFamilies to CSS fontFamily classes.
+const std::string GetFontCssClass(DistilledPagePrefs::FontFamily font_family) {
+  if (font_family == DistilledPagePrefs::SERIF) {
+    return kSerifCssClass;
+  } else if (font_family == DistilledPagePrefs::MONOSPACE) {
+    return kMonospaceCssClass;
+  }
+  return kSansSerifCssClass;
+}
+
 std::string ReplaceHtmlTemplateValues(
     const std::string& title,
     const std::string& content,
     const std::string& loading_indicator_class,
     const std::string& original_url,
-    const DistilledPagePrefs::Theme theme) {
+    const DistilledPagePrefs::Theme theme,
+    const DistilledPagePrefs::FontFamily font_family) {
   base::StringPiece html_template =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_DOM_DISTILLER_VIEWER_HTML);
@@ -72,7 +103,8 @@ std::string ReplaceHtmlTemplateValues(
   substitutions.push_back(title);                                         // $1
   substitutions.push_back(kViewerCssPath);                                // $2
   substitutions.push_back(kViewerJsPath);                                 // $3
-  substitutions.push_back(GetCssClass(theme));                            // $4
+  substitutions.push_back(GetThemeCssClass(theme) + " " +
+                          GetFontCssClass(font_family));                  // $4
   substitutions.push_back(content);                                       // $5
   substitutions.push_back(loading_indicator_class);                       // $6
   substitutions.push_back(
@@ -109,23 +141,22 @@ const std::string GetToggleLoadingIndicatorJs(const bool is_last_page) {
 
 const std::string GetUnsafePartialArticleHtml(
     const DistilledPageProto* page_proto,
-    const DistilledPagePrefs::Theme theme) {
+    const DistilledPagePrefs::Theme theme,
+    const DistilledPagePrefs::FontFamily font_family) {
   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,
-                                   theme);
+  return ReplaceHtmlTemplateValues(
+      title, unsafe_article_html, "visible", original_url, theme, font_family);

[robliao, 2014/08/10 02:43:45]

Adding just font_family at the end should be okay. Same as below.

[sunangel, 2014/08/11 21:51:33]

Done but contradicts git cl format. Also done for below for consistency. 
On 2014/08/10 02:43:45, robliao wrote:

 }
 
 const std::string GetUnsafeArticleHtml(
     const DistilledArticleProto* article_proto,
-    const DistilledPagePrefs::Theme theme) {
+    const DistilledPagePrefs::Theme theme,
+    const DistilledPagePrefs::FontFamily font_family) {
   DCHECK(article_proto);
   std::string title;
   std::string unsafe_article_html;
@@ -148,19 +179,19 @@ const std::string GetUnsafeArticleHtml(
     original_url = article_proto->pages(0).url();
   }
 
-  return ReplaceHtmlTemplateValues(title,
-                                   unsafe_article_html,
-                                   "hidden",
-                                   original_url,
-                                   theme);
+  return ReplaceHtmlTemplateValues(
+      title, unsafe_article_html, "hidden", original_url, theme, font_family);
 }
 
-const std::string GetErrorPageHtml(const DistilledPagePrefs::Theme theme) {
+const std::string GetErrorPageHtml(
+    const DistilledPagePrefs::Theme theme,
+    const DistilledPagePrefs::FontFamily font_family) {
   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", "", theme);
+  return ReplaceHtmlTemplateValues(
+      title, content, "hidden", "", theme, font_family);
 }
 
 const std::string GetCss() {
@@ -215,6 +246,11 @@ const std::string GetDistilledPageThemeJs(DistilledPagePrefs::Theme theme) {
   return "useTheme('" + GetJsTheme(theme) + "');";
 }
 
+const std::string GetDistilledPageFontFamilyJs(
+    DistilledPagePrefs::FontFamily font_family) {
+  return "useFontFamily('" + GetJsFontFamily(font_family) + "');";
+}
+
 }  // namespace viewer
 
 }  // namespace dom_distiller