Commit 0ab6244f authored by Zentaro Kavanagh's avatar Zentaro Kavanagh Committed by Commit Bot

Diagnostics: Add mojo interface to resources

Bug: 1125150
Test: browser_tests --gtest_filter=DiagnosticsApp*
Change-Id: I902e232c9abcad91ba852c726fe799725ac2d6a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523756Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarBailey Berro <baileyberro@chromium.org>
Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825926}
parent b461eca9
......@@ -96,6 +96,14 @@ DiagnosticsUI::DiagnosticsUI(content::WebUI* web_ui)
kChromeosDiagnosticsAppResourcesSize);
SetUpWebUIDataSource(html_source.get(), resources, kGeneratedPath,
IDR_DIAGNOSTICS_APP_INDEX_HTML);
html_source->AddResourcePath(
"system_data_provider.mojom-lite.js",
IDR_DIAGNOSTICS_SYSTEM_DATA_PROVIDER_MOJO_LITE_JS);
html_source->AddResourcePath(
"system_routine_controller.mojom-lite.js",
IDR_DIAGNOSTICS_SYSTEM_ROUTINE_CONTROLLER_MOJO_LITE_JS);
AddDiagnosticsStrings(html_source.get());
content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
html_source.release());
......
......@@ -116,6 +116,7 @@ js_library("mojo_interface_provider") {
":fake_data",
":fake_system_data_provider",
":fake_system_routine_controller",
"//chromeos/components/diagnostics_ui/mojom:mojom_js_library_for_compile",
"//ui/webui/resources/js:cr.m",
]
}
......
......@@ -36,6 +36,8 @@
<include name="IDR_DIAGNOSTICS_ROUTINE_RESULT_LIST_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/resources/routine_result_list.js" use_base_dir="false" type="BINDATA"/>
<include name="IDR_DIAGNOSTICS_ROUTINE_SECTION_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/resources/routine_section.js" use_base_dir="false" type="BINDATA"/>
<include name="IDR_DIAGNOSTICS_SHARED_CSS_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/resources/diagnostics_shared_css.js" use_base_dir="false" type="BINDDATA"/>
<include name="IDR_DIAGNOSTICS_SYSTEM_DATA_PROVIDER_MOJO_LITE_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/mojom/system_data_provider.mojom-lite.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_DIAGNOSTICS_SYSTEM_ROUTINE_CONTROLLER_MOJO_LITE_JS" file="${root_gen_dir}/chromeos/components/diagnostics_ui/mojom/system_routine_controller.mojom-lite.js" use_base_dir="false" type="BINDATA" />
<include name="IDR_DIAGNOSTICS_TYPES_JS" file="diagnostics_types.js" type="BINDATA"/>
<include name="IDR_D3_SRC_D3_MIN_JS" file="../../../../third_party/d3/src/d3.min.js" type="BINDATA" />
</includes>
......
......@@ -309,7 +309,10 @@ grit("diagnostics_app_resources") {
source =
"../components/diagnostics_ui/resources/diagnostics_app_resources.grd"
deps = [ "../components/diagnostics_ui/resources:web_components" ]
deps = [
"../components/diagnostics_ui/mojom:mojom_js",
"../components/diagnostics_ui/resources:web_components",
]
outputs = [
"chromeos_diagnostics_app_resources.pak",
......
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