Add support for showing CSS with distilled articles.

components/dom_distiller/content/dom_distiller_viewer_source.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/content/dom_distiller_viewer_source.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "content/public/common/url_constants.h"
 #include "grit/component_strings.h"
 #include "grit/dom_distiller_resources.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "url/gurl.h"
 
 namespace {
 
+const std::string kCssPath = "readability.css";

[Tom Sepez, 2014/01/14 22:22:50]

This creates a Non-POD static initializer. Use const char[] instead, promote to
string later as needed.

[Nico, 2014/01/15 05:35:26]

Yup.

[nyquist, 2014/01/15 22:50:59]

Done.

+
 std::string ReplaceHtmlTemplateValues(std::string title, std::string content) {
   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(title);    // $2
-  substitutions.push_back(content);  // $3
+  substitutions.push_back(title);     // $1
+  substitutions.push_back(kCssPath);  // $2
+  substitutions.push_back(title);     // $3
+  substitutions.push_back(content);   // $4
   return ReplaceStringPlaceholders(html_template, substitutions, NULL);
 }
 }
 
 namespace dom_distiller {
 
 // Handles receiving data asynchronously for a specific entry, and passing
 // it along to the data callback for the data source.
 class RequestViewerHandle : public ViewRequestDelegate {
  public:
@@ skipping 51 matching lines @@
 
 std::string DomDistillerViewerSource::GetSource() const {
   return chrome::kDomDistillerScheme;
 }
 
 void DomDistillerViewerSource::StartDataRequest(
     const std::string& path,
     int render_process_id,
     int render_view_id,
     const content::URLDataSource::GotDataCallback& callback) {
+  if (kCssPath == path) {
+    std::string css = ResourceBundle::GetSharedInstance()
+                          .GetRawDataResource(IDR_DISTILLER_CSS)

[Tom Sepez, 2014/01/14 22:22:50]

nit: not sure if the style guide wants the "."s on the end of the preceding
line.

[Nico, 2014/01/15 05:35:26]

I think this is what clang-format produces.

[nyquist, 2014/01/15 22:50:59]

Yeah, this is pure clang-format. Keeping as is then.

+                          .as_string();
+    callback.Run(base::RefCountedString::TakeString(&css));
+    return;
+  }
+
   RequestViewerHandle* request_viewer_handle =
       new RequestViewerHandle(callback);
   std::string entry_id = StringToUpperASCII(path);
   scoped_ptr<ViewerHandle> viewer_handle =
       dom_distiller_service_->ViewEntry(request_viewer_handle, entry_id);
   if (viewer_handle) {
     // The service returned a |ViewerHandle| and guarantees it will call
     // the |RequestViewerHandle|, so passing ownership to it, to ensure the
     // request is not cancelled.
     request_viewer_handle->TakeViewerHandle(viewer_handle.Pass());
   } else {
     // The service did not return a |ViewerHandle|, which means the
     // |RequestViewerHandle| will never be called, so cleanup now.
     delete request_viewer_handle;
 
     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);
     std::string html = ReplaceHtmlTemplateValues(title, content);
     callback.Run(base::RefCountedString::TakeString(&html));
   }
 };
 
 std::string DomDistillerViewerSource::GetMimeType(const std::string& path)
     const {
+  if (path == kCssPath)
+    return "text/css";
   return "text/html";
 }
 
 bool DomDistillerViewerSource::ShouldServiceRequest(
     const net::URLRequest* request) const {
   return request->url().SchemeIs(chrome::kDomDistillerScheme);
 }
 
 void DomDistillerViewerSource::WillServiceRequest(
     const net::URLRequest* request,
     std::string* path) const {
-  // Since the full request is not available to StartDataRequest, replace the
-  // path to contain the data needed.
-  path->assign(request->url().host());
+  if (*path != kCssPath) {
+    // Since the full request is not available to StartDataRequest, replace the
+    // path to contain the data needed.
+    path->assign(request->url().host());
+  }
 };
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyFrameSrc() const {
-  return "frame-src none;";
+  return "default-src 'none'; style-src 'self'";
 }
 
 }  // namespace dom_distiller