Loading Indicator 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"
@@ skipping 57 matching lines @@
   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(GetCssClass(theme));                            // $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_LOADING_STRING)); // $7
-  substitutions.push_back(original_url);                                  // $8
-  substitutions.push_back(
-      l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_VIEW_ORIGINAL));  // $9
+      l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_VIEW_ORIGINAL));  // $8
   return ReplaceStringPlaceholders(html_template, substitutions, NULL);
 }
 
 }  // namespace
 
 namespace viewer {
 
 const std::string GetUnsafeIncrementalDistilledPageJs(
     const DistilledPageProto* page_proto,
     const bool is_last_page) {
@@ skipping 16 matching lines @@
 
 const std::string GetUnsafePartialArticleHtml(
     const DistilledPageProto* page_proto,
     const DistilledPagePrefs::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,
-                                   theme);
+  return ReplaceHtmlTemplateValues(
+      title, unsafe_article_html, "visible", original_url, theme);

[robliao, 2014/08/07 17:58:07]

This line didn't change, so I would leave it alone.

[sunangel, 2014/08/07 20:57:57]

Done.

 }
 
 const std::string GetUnsafeArticleHtml(
     const DistilledArticleProto* article_proto,
     const DistilledPagePrefs::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()) {
@@ skipping 77 matching lines @@
   return scoped_ptr<ViewerHandle>();
 }
 
 const std::string GetDistilledPageThemeJs(DistilledPagePrefs::Theme theme) {
   return "useTheme('" + GetJsTheme(theme) + "');";
 }
 
 }  // namespace viewer
 
 }  // namespace dom_distiller