0

Decouple media_app_resources grd from chromeos_resources.

This is a better fit for layering/encapsulation/ownership. The
tradeoff is some "slippage" in resource_ids.

Bug: 996088
Change-Id: I6b5f03460c01e979da018dec757f88452a42adbb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1913284
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715232}
This commit is contained in:
Trent Apted
2019-11-14 11:32:29 +00:00
committed by Commit Bot
parent 4388fc983b
commit 2ee47a8313
9 changed files with 46 additions and 25 deletions

@ -161,6 +161,7 @@ template("chrome_extra_paks") {
"$root_gen_dir/chrome/os_settings_resources.pak",
"$root_gen_dir/chromeos/chromeos_help_app_resources.pak",
"$root_gen_dir/chromeos/chromeos_media_app_bundle_resources.pak",
"$root_gen_dir/chromeos/chromeos_media_app_resources.pak",
"$root_gen_dir/chromeos/chromeos_resources.pak",
"$root_gen_dir/third_party/ink/ink_resources.pak",
"$root_gen_dir/ui/file_manager/file_manager_resources.pak",
@ -174,6 +175,7 @@ template("chrome_extra_paks") {
"//chromeos/resources",
"//chromeos/resources:help_app_resources",
"//chromeos/resources:media_app_bundle_resources",
"//chromeos/resources:media_app_resources",
"//third_party/ink:ink_resources",
"//ui/file_manager:resources",
]

@ -19,8 +19,8 @@ static_library("media_app_ui") {
deps = [
"//chromeos/constants",
"//chromeos/resources",
"//chromeos/resources:media_app_bundle_resources",
"//chromeos/resources:media_app_resources",
"//content/public/browser",
"//ui/webui",
]

@ -7,7 +7,7 @@
#include "chromeos/components/media_app_ui/url_constants.h"
#include "chromeos/grit/chromeos_media_app_bundle_resources.h"
#include "chromeos/grit/chromeos_media_app_bundle_resources_map.h"
#include "chromeos/grit/chromeos_resources.h"
#include "chromeos/grit/chromeos_media_app_resources.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"

@ -7,7 +7,7 @@
#include "chromeos/components/media_app_ui/media_app_guest_ui.h"
#include "chromeos/components/media_app_ui/url_constants.h"
#include "chromeos/grit/chromeos_media_app_bundle_resources.h"
#include "chromeos/grit/chromeos_resources.h"
#include "chromeos/grit/chromeos_media_app_resources.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<grit latest_public_release="0" current_release="1" output_all_resource_defines="false">
<outputs>
<output filename="grit/chromeos_media_app_resources.h" type="rc_header">
<emit emit_type='prepend'></emit>
</output>
<output filename="chromeos_media_app_resources.pak" type="data_package" />
</outputs>
<release seq="1">
<includes>
<!-- Privileged app host contents. -->
<include name="IDR_MEDIA_APP_INDEX_HTML" file="index.html" type="BINDATA" />
<include name="IDR_MEDIA_APP_PWA_HTML" file="pwa.html" type="BINDATA" />
<include name="IDR_MEDIA_APP_MANIFEST" file="manifest.json" type="BINDATA" />
<!-- Unprivileged guest contents. -->
<include name="IDR_MEDIA_APP_APP_HTML" file="app.html" type="BINDATA" />
</includes>
</release>
</grit>

@ -55,6 +55,21 @@ grit("help_app_resources") {
output_dir = "$root_gen_dir/chromeos"
}
# Resources used by chrome://media-app, and parts of the sandboxed app it hosts
# that do no come from the app bundle (below).
grit("media_app_resources") {
source = "../components/media_app_ui/resources/media_app_resources.grd"
source_is_generated = true
outputs = [
"grit/chromeos_media_app_resources.h",
"chromeos_media_app_resources.pak",
]
output_dir = "$root_gen_dir/chromeos"
}
# Resources automatically served by the chrome://media-app bundle, obtained via DEPS.
grit("media_app_bundle_resources") {
if (enable_cros_media_app) {
# Obtained via src-internal/DEPS.

@ -18,7 +18,6 @@
<if expr="enable_cros_libassistant">
<part file="assistant_resources.grdp" />
</if>
<part file="media_app_resources.grdp" />
</includes>
</release>
</grit>

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<grit-part>
<!-- Privileged app host contents. -->
<include name="IDR_MEDIA_APP_INDEX_HTML"
file="../components/media_app_ui/resources/index.html"
type="BINDATA" />
<include name="IDR_MEDIA_APP_PWA_HTML"
file="../components/media_app_ui/resources/pwa.html"
type="BINDATA" />
<include name="IDR_MEDIA_APP_MANIFEST"
file="../components/media_app_ui/resources/manifest.json"
type="BINDATA" />
<!-- Unprivileged guest contents. -->
<include name="IDR_MEDIA_APP_APP_HTML"
file="../components/media_app_ui/resources/app.html"
type="BINDATA" />
</grit-part>

@ -212,17 +212,20 @@
"chromeos/components/help_app_ui/resources/help_app_resources.grd": {
"includes": [14580],
},
"chromeos/components/media_app_ui/resources/media_app_resources.grd": {
"includes": [14680],
},
# Both media_app_bundle_resources.grd and media_app_bundle_mock_resources.grd start
# with the same id because only one of them is built depending on if src_internal is
# available. Lower bound for number of resource ids is number of languages (74).
"chromeos/components/media_app_ui/resources/app/app/media_app_bundle_resources.grd": {
"includes": [14680],
"includes": [14690],
},
"chromeos/components/media_app_ui/resources/mock/media_app_bundle_mock_resources.grd": {
"includes": [14680],
"includes": [14690],
},
"chromeos/resources/chromeos_resources.grd": {
"includes": [14780],
"includes": [14790],
},
# END chromeos/ section.