Commit 33148889 authored by Becca Hughes's avatar Becca Hughes Committed by Commit Bot

Public part of the module CL

This adds the new CSS file and makes more resources
available to the NTP.

Change-Id: Iee5435ddb3f26e153628ccdcff0032efe29bed50
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363566Reviewed-by: default avatarTibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: default avatarTommy Steimel <steimel@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799750}
parent 8e8b352d
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<!-- Private resources --> <!-- Private resources -->
<include name="IDR_KALEIDOSCOPE_CONTENT_CSS" file="internal/resources/content.css" type="chrome_html" flattenhtml="true" /> <include name="IDR_KALEIDOSCOPE_CONTENT_CSS" file="internal/resources/content.css" type="chrome_html" flattenhtml="true" />
<include name="IDR_KALEIDOSCOPE_SHARED_CSS" file="internal/resources/shared.css" type="chrome_html" flattenhtml="true" />
<include name="IDR_KALEIDOSCOPE_CONTENT_HTML" file="internal/resources/content.html" type="BINDATA" /> <include name="IDR_KALEIDOSCOPE_CONTENT_HTML" file="internal/resources/content.html" type="BINDATA" />
<include name="IDR_KALEIDOSCOPE_CONTENT_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-content.js" use_base_dir="false" type="BINDATA" /> <include name="IDR_KALEIDOSCOPE_CONTENT_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-content.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_KALEIDOSCOPE_CONTENT_WORKER_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-content-worker.js" use_base_dir="false" type="BINDATA" /> <include name="IDR_KALEIDOSCOPE_CONTENT_WORKER_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-content-worker.js" use_base_dir="false" type="BINDATA" />
......
...@@ -252,6 +252,8 @@ content::WebUIDataSource* KaleidoscopeUI::CreateWebUIDataSource() { ...@@ -252,6 +252,8 @@ content::WebUIDataSource* KaleidoscopeUI::CreateWebUIDataSource() {
"chrome/browser/media/feeds/media_feeds_store.mojom-lite.js", "chrome/browser/media/feeds/media_feeds_store.mojom-lite.js",
IDR_MEDIA_FEEDS_STORE_MOJOM_LITE_JS); IDR_MEDIA_FEEDS_STORE_MOJOM_LITE_JS);
html_source->AddResourcePath("module.js", IDR_KALEIDOSCOPE_NTP_MODULE_JS); html_source->AddResourcePath("module.js", IDR_KALEIDOSCOPE_NTP_MODULE_JS);
html_source->AddResourcePath("content.js", IDR_KALEIDOSCOPE_CONTENT_JS);
html_source->AddResourcePath("shared.css", IDR_KALEIDOSCOPE_SHARED_CSS);
html_source->SetDefaultResource(IDR_KALEIDOSCOPE_HTML); html_source->SetDefaultResource(IDR_KALEIDOSCOPE_HTML);
#endif // BUILDFLAG(ENABLE_KALEIDOSCOPE) #endif // BUILDFLAG(ENABLE_KALEIDOSCOPE)
...@@ -302,6 +304,7 @@ content::WebUIDataSource* KaleidoscopeUI::CreateUntrustedWebUIDataSource() { ...@@ -302,6 +304,7 @@ content::WebUIDataSource* KaleidoscopeUI::CreateUntrustedWebUIDataSource() {
#if BUILDFLAG(ENABLE_KALEIDOSCOPE) #if BUILDFLAG(ENABLE_KALEIDOSCOPE)
untrusted_source->AddResourcePath("content.css", untrusted_source->AddResourcePath("content.css",
IDR_KALEIDOSCOPE_CONTENT_CSS); IDR_KALEIDOSCOPE_CONTENT_CSS);
untrusted_source->AddResourcePath("shared.css", IDR_KALEIDOSCOPE_SHARED_CSS);
untrusted_source->AddResourcePath("content.js", IDR_KALEIDOSCOPE_CONTENT_JS); untrusted_source->AddResourcePath("content.js", IDR_KALEIDOSCOPE_CONTENT_JS);
untrusted_source->AddResourcePath("content-worker.js", untrusted_source->AddResourcePath("content-worker.js",
IDR_KALEIDOSCOPE_CONTENT_WORKER_JS); IDR_KALEIDOSCOPE_CONTENT_WORKER_JS);
......
...@@ -21,15 +21,16 @@ const Resource = {}; ...@@ -21,15 +21,16 @@ const Resource = {};
* @type {Array<Resource>} * @type {Array<Resource>}
*/ */
const KALEIDOSCOPE_RESOURCES = [ const KALEIDOSCOPE_RESOURCES = [
{url: 'chrome://kaleidoscope/geometry.mojom-lite.js', module: true}, {url: 'chrome://kaleidoscope/geometry.mojom-lite.js'},
{ {
url: url:
'chrome://kaleidoscope/chrome/browser/media/feeds/media_feeds_store.mojom-lite.js', 'chrome://kaleidoscope/chrome/browser/media/feeds/media_feeds_store.mojom-lite.js'
module: true
}, },
{url: 'chrome://kaleidoscope/kaleidoscope.mojom-lite.js', module: true}, {url: 'chrome://kaleidoscope/kaleidoscope.mojom-lite.js'},
{url: 'chrome://kaleidoscope/messages.js'}, {url: 'chrome://kaleidoscope/messages.js'},
{url: 'chrome://kaleidoscope/kaleidoscope.js'}, {url: 'chrome://kaleidoscope/kaleidoscope.js'},
{url: 'chrome://kaleidoscope/content.js'},
{url: 'chrome://kaleidoscope/resources/_locales/strings.js'},
{url: 'chrome://kaleidoscope/module.js', module: true}, {url: 'chrome://kaleidoscope/module.js', module: true},
]; ];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment