Commit 6b9fcabb authored by dpapad's avatar dpapad Committed by Commit Bot

WebUI: Move shared google_logo.svg to NTP only code.

There is no reason for this file to be part of the shared
webui_resources.grd, as it is only used by NTP as follows:

 1) chrome-search://local-ntp/ (deprecated)
 2) chrome://new-tab-page

The former directly inlines the image by using flattenhtml=true, whereas
the latter consumes it from a chrome:// URL.

This is part of the effort of auto-genearting the contents of
webui_resources.grd.

Bug: 1132403
Change-Id: I20642b4c845393daf72597f156f7a934c9f3ea93
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533646
Auto-Submit: dpapad <dpapad@chromium.org>
Commit-Queue: Esmael Elmoslimany <aee@chromium.org>
Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827003}
parent 24b16741
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
#logo-default, #logo-default,
#logo-non-white { #logo-non-white {
background-image: url(../../../../ui/webui/resources/images/google_logo.svg); background-image: url(../new_tab_page/icons/google_logo.svg);
background-repeat: no-repeat; background-repeat: no-repeat;
bottom: var(--logo-margin-bottom); bottom: var(--logo-margin-bottom);
height: 92px; height: 92px;
...@@ -80,8 +80,7 @@ ...@@ -80,8 +80,7 @@
body.alternate-logo #logo-default, body.alternate-logo #logo-default,
body.alternate-logo #logo-non-white { body.alternate-logo #logo-non-white {
-webkit-mask-image: -webkit-mask-image: url(../new_tab_page/icons/google_logo.svg);
url(../../../../ui/webui/resources/images/google_logo.svg);
-webkit-mask-repeat: no-repeat; -webkit-mask-repeat: no-repeat;
-webkit-mask-size: 100%; -webkit-mask-size: 100%;
background: var(--logo-color); background: var(--logo-color);
......
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
} }
:host([single-colored]) #logo { :host([single-colored]) #logo {
-webkit-mask-image: url(chrome://resources/images/google_logo.svg); -webkit-mask-image: url(./icons/google_logo.svg);
-webkit-mask-repeat: no-repeat; -webkit-mask-repeat: no-repeat;
-webkit-mask-size: 100%; -webkit-mask-size: 100%;
background-color: var(--ntp-logo-color); background-color: var(--ntp-logo-color);
} }
:host(:not([single-colored])) #logo { :host(:not([single-colored])) #logo {
background-image: url(chrome://resources/images/google_logo.svg); background-image: url(./icons/google_logo.svg);
} }
#imageDoodle { #imageDoodle {
......
...@@ -73,6 +73,8 @@ ...@@ -73,6 +73,8 @@
<include name="IDR_NEW_TAB_PAGE_REALBOX_MATCH_JS" <include name="IDR_NEW_TAB_PAGE_REALBOX_MATCH_JS"
file="${root_gen_dir}/chrome/browser/resources/new_tab_page/realbox_match.js" file="${root_gen_dir}/chrome/browser/resources/new_tab_page/realbox_match.js"
use_base_dir="false" type="BINDATA" compress="false" /> use_base_dir="false" type="BINDATA" compress="false" />
<include name="IDR_NEW_TAB_PAGE_ICONS_GOOGLE_LOGO_SVG"
file="icons/google_logo.svg" type="BINDATA" />
<include name="IDR_NEW_TAB_PAGE_IMG_JS" <include name="IDR_NEW_TAB_PAGE_IMG_JS"
file="img.js" type="BINDATA" compress="false" /> file="img.js" type="BINDATA" compress="false" />
<include name="IDR_NEW_TAB_PAGE_BROWSER_PROXY_JS" <include name="IDR_NEW_TAB_PAGE_BROWSER_PROXY_JS"
......
...@@ -59,8 +59,6 @@ without changes to the corresponding grd file. --> ...@@ -59,8 +59,6 @@ without changes to the corresponding grd file. -->
<!-- Similar to IDR_WEBUI_IMAGES_ERROR except that it is white-filled instead of transparent-filled. Useful for badging images where the background may be red. --> <!-- Similar to IDR_WEBUI_IMAGES_ERROR except that it is white-filled instead of transparent-filled. Useful for badging images where the background may be red. -->
<include name="IDR_WEBUI_IMAGES_ERROR_BADGE_SVG" <include name="IDR_WEBUI_IMAGES_ERROR_BADGE_SVG"
file="images/error_badge.svg" type="BINDATA" /> file="images/error_badge.svg" type="BINDATA" />
<include name="IDR_WEBUI_IMAGES_GOOGLE_LOGO_SVG"
file="images/google_logo.svg" type="BINDATA" />
<include name="IDR_WEBUI_IMAGES_SELECT_PNG" <include name="IDR_WEBUI_IMAGES_SELECT_PNG"
file="images/select.png" type="BINDATA" /> file="images/select.png" type="BINDATA" />
<include name="IDR_WEBUI_IMAGES_THROBBER_MEDIUM_SVG" <include name="IDR_WEBUI_IMAGES_THROBBER_MEDIUM_SVG"
......
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