Commit 86f11be9 authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

OS Settings: Move some SVG assets out-of-line.

This is necessary because Polymer 3 infra does not support flattenhtml.

R=khorimoto@chromium.org

Bug: none
Test: OS Settings -> Networks -> Add Network -> See add wifi icon
Change-Id: I8957b3d60aad33e13a785d2fef15922c10218abb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446522Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813427}
parent 8d49dd6e
......@@ -8,15 +8,15 @@
<style>
cr-icon-button.icon-add-circle {
--cr-icon-button-fill-color: var(--google-blue-500);
--cr-icon-image: url(./images/icon_add_circle.svg);
--cr-icon-image: url(chrome://os-settings/images/icon_add_circle.svg);
}
cr-icon-button.icon-add-wifi {
--cr-icon-button-fill-color: var(--google-blue-500);
--cr-icon-image: url(./images/icon_add_wifi.svg);
--cr-icon-image: url(chrome://os-settings/images/icon_add_wifi.svg);
}
cr-icon-button.icon-add-cellular {
--cr-icon-button-fill-color: var(--google-blue-500);
--cr-icon-image: url(./images/icon_add_cellular.svg);
--cr-icon-image: url(chrome://os-settings/images/icon_add_cellular.svg);
}
</style>
</template>
......
......@@ -1595,6 +1595,15 @@
<structure name="IDR_OS_SETTINGS_SEARCH_HANDLER_JS"
file="chromeos/search_handler.js"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_ICON_ADD_CIRCLE_SVG"
file="chromeos/images/icon_add_circle.svg"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_ICON_ADD_WIFI_SVG"
file="chromeos/images/icon_add_wifi.svg"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_ICON_ADD_CELLULAR_SVG"
file="chromeos/images/icon_add_cellular.svg"
type="chrome_html" />
</structures>
</release>
</grit>
......@@ -97,6 +97,20 @@
file="${root_gen_dir}\chrome\browser\resources\settings\chromeos\shared.rollup.js"
type="BINDATA"
use_base_dir="false" />
<!-- SVG assets -->
<include name="IDR_OS_SETTINGS_ICON_ADD_CIRCLE_SVG"
file="chromeos/images/icon_add_circle.svg"
type="BINDATA"
compress="gzip" />
<include name="IDR_OS_SETTINGS_ICON_ADD_WIFI_SVG"
file="chromeos/images/icon_add_wifi.svg"
type="BINDATA"
compress="gzip" />
<include name="IDR_OS_SETTINGS_ICON_ADD_CELLULAR_SVG"
file="chromeos/images/icon_add_cellular.svg"
type="BINDATA"
compress="gzip" />
</includes>
</release>
</grit>
......@@ -111,6 +111,13 @@ OSSettingsUI::OSSettingsUI(content::WebUI* web_ui)
RegisterNearbySharedResources(html_source);
#endif
html_source->AddResourcePath("images/icon_add_circle.svg",
IDR_OS_SETTINGS_ICON_ADD_CIRCLE_SVG);
html_source->AddResourcePath("images/icon_add_wifi.svg",
IDR_OS_SETTINGS_ICON_ADD_WIFI_SVG);
html_source->AddResourcePath("images/icon_add_cellular.svg",
IDR_OS_SETTINGS_ICON_ADD_CELLULAR_SVG);
ManagedUIHandler::Initialize(web_ui, html_source);
content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
......
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