Theme Preferences 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"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
+#include "components/dom_distiller/core/reader_mode_preferences.h"

[nyquist, 2014/06/26 20:39:59]

Remove this.

[smaslo, 2014/06/27 18:33:18]

Now needed for enum declaration.

 #include "components/dom_distiller/core/task_tracker.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/dom_distiller/core/url_utils.h"
 #include "grit/component_resources.h"
 #include "grit/components_strings.h"
 #include "net/base/escape.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"
@@ skipping 95 matching lines @@
 
 const std::string GetErrorPageHtml() {
   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", "");
 }
 
 const std::string GetCss() {
-  return ResourceBundle::GetSharedInstance()
-      .GetRawDataResource(IDR_DISTILLER_CSS)
-      .as_string();
+  return ResourceBundle::GetSharedInstance().GetRawDataResource(

[nyquist, 2014/06/26 20:39:59]

Even though this is not wrong, I'd just revert this whole file, since you have
no other changes in it.

[smaslo, 2014/06/27 18:33:18]

Done.

+          IDR_DISTILLER_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,
@@ skipping 27 matching lines @@
                                           requested_url).Pass();
   }
 
   // It is invalid to not specify a query param for |kEntryIdKey| or |kUrlKey|.
   return scoped_ptr<ViewerHandle>();
 }
 
 }  // namespace viewer
 
 }  // namespace dom_distiller