HTML exit reader view button

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 99 matching lines @@
   base::StringPiece html_template =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_DOM_DISTILLER_VIEWER_HTML);
   std::vector<std::string> substitutions;
 
   std::ostringstream css;
   std::ostringstream script;
 #if defined(OS_IOS)
   // On iOS the content is inlined as there is no API to detect those requests
   // and return the local data once a page is loaded.
-  css << "<style>" << viewer::GetCss() << "</style>";
+  css << "<style>" << viewer::GetCss() << viewer::GetIOSCss() << "</style>";
   script << "<script>\n" << viewer::GetJavaScript() << "\n</script>";
 #else
   css << "<link rel=\"stylesheet\" href=\"/" << kViewerCssPath << "\">";
   script << "<script src=\"" << kViewerJsPath << "\"></script>";
 #endif  // defined(OS_IOS)
 
   substitutions.push_back(
       l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_LOADING_TITLE));  // $1
 
   substitutions.push_back(css.str());                                     // $2
   substitutions.push_back(GetThemeCssClass(theme) + " " +
                           GetFontCssClass(font_family));                  // $3
 
   substitutions.push_back(
       l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_NO_DATA_TITLE));  // $4
   substitutions.push_back(
       l10n_util::GetStringUTF8(
           IDS_DOM_DISTILLER_JAVASCRIPT_DISABLED_CONTENT));                // $5
 
   substitutions.push_back(original_url);                                  // $6
   substitutions.push_back(
-      l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_VIEW_ORIGINAL));  // $7
+      l10n_util::GetStringUTF8(
+          IDS_DOM_DISTILLER_VIEWER_CLOSE_READER_VIEW));                   // $7
 
   substitutions.push_back(script.str());                                  // $8
 
   return ReplaceStringPlaceholders(html_template, substitutions, NULL);
 }
 
 }  // namespace
 
 namespace viewer {
 
@@ skipping 85 matching lines @@
   std::string page_update("addToPage(");
   page_update += output + ");";
   return page_update + GetToggleLoadingIndicatorJs(true);
 }
 
 const std::string GetCss() {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_DISTILLER_CSS).as_string();
 }
 
+const std::string GetIOSCss() {
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(
+          IDR_DISTILLER_IOS_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,
     const std::string& path,
     ViewRequestDelegate* view_request_delegate,
@@ skipping 35 matching lines @@
 }
 
 const std::string GetDistilledPageFontFamilyJs(
     DistilledPagePrefs::FontFamily font_family) {
   return "useFontFamily('" + GetJsFontFamily(font_family) + "');";
 }
 
 }  // namespace viewer
 
 }  // namespace dom_distiller