Loading Indicator 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..7891c3feaba8964eb37e302eab50d9502c1d16b1 100644
--- a/components/dom_distiller/core/viewer.cc
+++ b/components/dom_distiller/core/viewer.cc
@@ -75,11 +75,9 @@ std::string ReplaceHtmlTemplateValues(
   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);
 }
 
@@ -116,11 +114,8 @@ const std::string GetUnsafePartialArticleHtml(
   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(