Media Controls: Move media controls resources to media_controls module
As part of converting media_controls to using Grit, this adds
blink_scaled_resources_100/200_percent rules to Blink that will
repack all the scaled Blink resources and combine them. This then
updates the dependencies of blink image_resources to use the
new scaled_resources. Moves the media controls resources to the
media_controls module.
BUG=747975
Change-Id: Ia64d3e2f3a79eb4f893a3ba5df7cf0069ca3e733
Reviewed-on: https://chromium-review.googlesource.com/582812
Reviewed-by: Jochen Eisinger <[email protected]>
Reviewed-by: Kentaro Hara <[email protected]>
Reviewed-by: Mounir Lamouri <[email protected]>
Commit-Queue: Becca Hughes <[email protected]>
Cr-Commit-Position: refs/heads/master@{#492298}diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index f40d1e73..29434823 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1698,8 +1698,8 @@
"//storage/common",
"//third_party/WebKit/common:blink_common",
"//third_party/WebKit/public:features",
- "//third_party/WebKit/public:image_resources",
"//third_party/WebKit/public:resources",
+ "//third_party/WebKit/public:scaled_resources",
"//third_party/cacheinvalidation",
"//third_party/icu",
"//third_party/leveldatabase",
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index b221b87d..e912f03b 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -900,8 +900,8 @@
"//sql",
"//storage/browser",
"//storage/common",
- "//third_party/WebKit/public:image_resources",
"//third_party/WebKit/public:resources",
+ "//third_party/WebKit/public:scaled_resources",
"//third_party/cacheinvalidation",
"//third_party/icu",
"//third_party/leveldatabase",
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
index a7778f9..6bbe0ff 100644
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -29,7 +29,7 @@
# All sources should also have deps for completeness.
sources = [
- "$root_gen_dir/blink/public/resources/blink_image_resources_${percent}_percent.pak",
+ "$root_gen_dir/blink/public/resources/blink_scaled_resources_${percent}_percent.pak",
"$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak",
"$root_gen_dir/chrome/theme_resources_${percent}_percent.pak",
"$root_gen_dir/components/components_resources_${percent}_percent.pak",
@@ -44,7 +44,7 @@
"//components/strings",
"//content/app/resources",
"//net:net_resources",
- "//third_party/WebKit/public:image_resources",
+ "//third_party/WebKit/public:scaled_resources_${percent}_percent",
"//ui/resources",
]
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index df56a130..ba0ade68 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -155,8 +155,8 @@
"//skia",
"//storage/common",
"//third_party/WebKit/public:blink",
- "//third_party/WebKit/public:image_resources",
"//third_party/WebKit/public:resources",
+ "//third_party/WebKit/public:scaled_resources",
"//third_party/icu",
"//third_party/re2",
"//third_party/widevine/cdm:headers",
