Navi: Use internal icons and delete PNGs from chromium.

Moved icons:
  - gmail.png
  - maps.png
  - news.png
  - translate.png
  - youtube.png

Bug: 950188
Change-Id: Ib1b5fad4be494dae18517865a11003412c0a1bed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1626732
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Dan Beam <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662850}

chrome/browser/resources/welcome/onboarding_welcome/google_apps/nux_google_apps.html

@@ -142,32 +142,32 @@
       /* App Icons */
       .gmail {
         content: -webkit-image-set(
-            url(chrome://welcome/images/gmail_1x.png) 1x,
-            url(chrome://welcome/images/gmail_2x.png) 2x);
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_GMAIL@1x) 1x,
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_GMAIL@2x) 2x);
       }
 
       .youtube {
         content: -webkit-image-set(
-            url(chrome://welcome/images/youtube_1x.png) 1x,
-            url(chrome://welcome/images/youtube_2x.png) 2x);
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_YOUTUBE@1x) 1x,
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_YOUTUBE@2x) 2x);
       }
 
       .maps {
         content: -webkit-image-set(
-            url(chrome://welcome/images/maps_1x.png) 1x,
-            url(chrome://welcome/images/maps_2x.png) 2x);
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_MAPS@1x) 1x,
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_MAPS@2x) 2x);
       }
 
       .translate {
         content: -webkit-image-set(
-            url(chrome://welcome/images/translate_1x.png) 1x,
-            url(chrome://welcome/images/translate_2x.png) 2x);
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_TRANSLATE@1x) 1x,
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_TRANSLATE@2x) 2x);
       }
 
       .news {
         content: -webkit-image-set(
-            url(chrome://welcome/images/news_1x.png) 1x,
-            url(chrome://welcome/images/news_2x.png) 2x);
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_MAPS@1x) 1x,
+            url(chrome://theme/IDS_ONBOARDING_WELCOME_MAPS@2x) 2x);
       }
 
       .search {
@@ -175,12 +175,6 @@
             url(chrome://theme/IDS_ONBOARDING_WELCOME_SEARCH@1x) 1x,
             url(chrome://theme/IDS_ONBOARDING_WELCOME_SEARCH@2x) 2x);
       }
-
-      .web-store {
-        content: -webkit-image-set(
-            url(chrome://welcome/images/chrome_store_1x.png) 1x,
-            url(chrome://welcome/images/chrome_store_2x.png) 2x);
-      }
     </style>
     <div class="apps-ask">
       <div class="chrome-logo" alt=""></div>

chrome/browser/resources/welcome/onboarding_welcome/onboarding_welcome_resources.grd

@@ -14,36 +14,6 @@
   </outputs>
   <release seq="1">
     <includes>
-      <include name="IDR_NUX_GOOGLE_APPS_GMAIL_1X"
-               file="images/gmail_1x.png"
-               type="BINDATA" />
-      <include name="IDR_NUX_GOOGLE_APPS_GMAIL_2X"
-               file="images/gmail_2x.png"
-               type="BINDATA" />
-      <include name="IDR_NUX_GOOGLE_APPS_MAPS_1X"
-               file="images/maps_1x.png"
-               type="BINDATA" />
-      <include name="IDR_NUX_GOOGLE_APPS_MAPS_2X"
-               file="images/maps_2x.png"
-               type="BINDATA" />
-      <include name="IDR_NUX_GOOGLE_APPS_NEWS_1X"
-               file="images/news_1x.png"
-               type="BINDATA" />
-      <include name="IDR_NUX_GOOGLE_APPS_NEWS_2X"
-               file="images/news_2x.png"
-               type="BINDATA" />
-      <include name="IDR_NUX_GOOGLE_APPS_TRANSLATE_1X"
-               file="images/translate_1x.png"
-               type="BINDATA" />
-      <include name="IDR_NUX_GOOGLE_APPS_TRANSLATE_2X"
-               file="images/translate_2x.png"
-               type="BINDATA" />
-      <include name="IDR_NUX_GOOGLE_APPS_YOUTUBE_1X"
-               file="images/youtube_1x.png"
-               type="BINDATA" />
-      <include name="IDR_NUX_GOOGLE_APPS_YOUTUBE_2X"
-               file="images/youtube_2x.png"
-               type="BINDATA" />
       <include name="IDR_NUX_MODULE_ICONS_GOOGLE_DARK"
                file="images/module_icons/google_dark.svg"
                compress="gzip"

chrome/browser/ui/webui/welcome/nux/google_apps_handler.cc

@@ -45,6 +45,7 @@ const char* kGoogleAppsInteractionHistogram =
 constexpr const int kGoogleAppIconSize = 48;  // Pixels.
 
 GoogleAppsHandler::GoogleAppsHandler() {
+#if defined(GOOGLE_CHROME_BUILD)
   // Do not translate icon name as it is not human visible and needs to
   // match CSS.
 
@@ -52,15 +53,13 @@ GoogleAppsHandler::GoogleAppsHandler() {
       static_cast<int>(GoogleApps::kGmail),
       l10n_util::GetStringUTF8(IDS_ONBOARDING_WELCOME_NUX_GOOGLE_GMAIL),
       "gmail", "https://accounts.google.com/b/0/AddMailService",
-      IDR_NUX_GOOGLE_APPS_GMAIL_1X};
+      IDS_ONBOARDING_WELCOME_GMAIL};
 
   if (IsAppVariationEnabled()) {
-#if defined(GOOGLE_CHROME_BUILD)
     google_apps_.push_back(
         {static_cast<int>(GoogleApps::kSearch),
          l10n_util::GetStringUTF8(IDS_ONBOARDING_WELCOME_NUX_GOOGLE_SEARCH),
          "search", "https://google.com", IDS_ONBOARDING_WELCOME_SEARCH});
-#endif  // GOOGLE_CHROME_BUILD
   } else {
     google_apps_.push_back(gmail);
   }
@@ -68,12 +67,12 @@ GoogleAppsHandler::GoogleAppsHandler() {
   google_apps_.push_back(
       {static_cast<int>(GoogleApps::kYouTube),
        l10n_util::GetStringUTF8(IDS_ONBOARDING_WELCOME_NUX_GOOGLE_APPS_YOUTUBE),
-       "youtube", "https://youtube.com", IDR_NUX_GOOGLE_APPS_YOUTUBE_1X});
+       "youtube", "https://youtube.com", IDS_ONBOARDING_WELCOME_YOUTUBE});
 
   google_apps_.push_back(
       {static_cast<int>(GoogleApps::kMaps),
        l10n_util::GetStringUTF8(IDS_ONBOARDING_WELCOME_NUX_GOOGLE_APPS_MAPS),
-       "maps", "https://maps.google.com", IDR_NUX_GOOGLE_APPS_MAPS_1X});
+       "maps", "https://maps.google.com", IDS_ONBOARDING_WELCOME_MAPS});
 
   if (IsAppVariationEnabled()) {
     google_apps_.push_back(gmail);
@@ -81,14 +80,15 @@ GoogleAppsHandler::GoogleAppsHandler() {
     google_apps_.push_back(
         {static_cast<int>(GoogleApps::kNews),
          l10n_util::GetStringUTF8(IDS_ONBOARDING_WELCOME_NUX_GOOGLE_APPS_NEWS),
-         "news", "https://news.google.com", IDR_NUX_GOOGLE_APPS_NEWS_1X});
+         "news", "https://news.google.com", IDS_ONBOARDING_WELCOME_NEWS});
   }
 
   google_apps_.push_back({static_cast<int>(GoogleApps::kTranslate),
                           l10n_util::GetStringUTF8(
                               IDS_ONBOARDING_WELCOME_NUX_GOOGLE_APPS_TRANSLATE),
                           "translate", "https://translate.google.com",
-                          IDR_NUX_GOOGLE_APPS_TRANSLATE_1X});
+                          IDS_ONBOARDING_WELCOME_TRANSLATE});
+#endif  // defined(GOOGLE_CHROME_BUILD)
 }
 
 GoogleAppsHandler::~GoogleAppsHandler() {}

components/resources/onboarding_welcome_scaled_resources.grdp

 <?xml version="1.0" encoding="UTF-8"?>
 <grit-part>
   <if expr="not is_android and not is_ios and _google_chrome">
+    <structure type="chrome_scaled_image" name="IDS_ONBOARDING_WELCOME_GMAIL" file="google_chrome/welcome/gmail.png" />
+    <structure type="chrome_scaled_image" name="IDS_ONBOARDING_WELCOME_MAPS" file="google_chrome/welcome/maps.png" />
+    <structure type="chrome_scaled_image" name="IDS_ONBOARDING_WELCOME_NEWS" file="google_chrome/welcome/news.png" />
     <structure type="chrome_scaled_image" name="IDS_ONBOARDING_WELCOME_SEARCH" file="google_chrome/welcome/search.png" />
+    <structure type="chrome_scaled_image" name="IDS_ONBOARDING_WELCOME_TRANSLATE" file="google_chrome/welcome/translate.png" />
+    <structure type="chrome_scaled_image" name="IDS_ONBOARDING_WELCOME_YOUTUBE" file="google_chrome/welcome/youtube.png" />
   </if>
 </grit-part>