Update protobuff and template to handle text direction

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"
@@ skipping 84 matching lines @@
     *title = l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_NO_DATA_TITLE);
   UMA_HISTOGRAM_BOOLEAN("DomDistiller.PageHasDistilledData", !content->empty());
   if (content->empty()) {
     *content = l10n_util::GetStringUTF8(
         IDS_DOM_DISTILLER_VIEWER_NO_DATA_CONTENT);
   }
 }
 
 std::string ReplaceHtmlTemplateValues(
     const std::string& title,
+    const std::string& textDirection,
     const std::string& content,
     const std::string& loading_indicator_class,
     const std::string& original_url,
     const DistilledPagePrefs::Theme theme,
     const DistilledPagePrefs::FontFamily font_family) {
   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(GetThemeCssClass(theme) + " " +
                           GetFontCssClass(font_family));                  // $4
   substitutions.push_back(content);                                       // $5
   substitutions.push_back(loading_indicator_class);                       // $6
   substitutions.push_back(original_url);                                  // $7
   substitutions.push_back(
       l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_VIEW_ORIGINAL));  // $8
+  substitutions.push_back(textDirection);                                 // $9
   return ReplaceStringPlaceholders(html_template, substitutions, NULL);
 }
 
 }  // namespace
 
 namespace viewer {
 
 const std::string GetUnsafeIncrementalDistilledPageJs(
     const DistilledPageProto* page_proto,
     const bool is_last_page) {
@@ skipping 19 matching lines @@
     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();
   EnsureNonEmptyTitleAndContent(&title, &unsafe_article_html);
   std::string original_url = page_proto->url();
   return ReplaceHtmlTemplateValues(
-      title, unsafe_article_html, "visible", original_url, theme, font_family);
+      title, page_proto->text_direction(), unsafe_article_html, "visible",
+      original_url, theme, font_family);
 }
 
 const std::string GetUnsafeArticleHtml(
     const DistilledArticleProto* article_proto,
     const DistilledPagePrefs::Theme theme,
     const DistilledPagePrefs::FontFamily font_family) {
   DCHECK(article_proto);
   std::string title;
   std::string unsafe_article_html;
+  std::string text_direction = "";
   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();
+    text_direction = article_proto->pages(0).text_direction();
   }
 
   EnsureNonEmptyTitleAndContent(&title, &unsafe_article_html);
 
   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, theme, font_family);
+      title, text_direction, unsafe_article_html, "hidden", original_url,
+      theme, font_family);
 }
 
 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, font_family);
+      title, "", content, "hidden", "", theme, font_family);
 }
 
 const std::string GetCss() {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_DISTILLER_CSS).as_string();
 }
 
 const std::string GetJavaScript() {
   return ResourceBundle::GetSharedInstance()
       .GetRawDataResource(IDR_DOM_DISTILLER_VIEWER_JS)
@@ skipping 42 matching lines @@
 }
 
 const std::string GetDistilledPageFontFamilyJs(
     DistilledPagePrefs::FontFamily font_family) {
   return "useFontFamily('" + GetJsFontFamily(font_family) + "');";
 }
 
 }  // namespace viewer
 
 }  // namespace dom_distiller