Onboarding WebUI: Move all images to the dedicated .grd file.

Bug: 895633
Change-Id: I6ce9829dedf5af302cce660d9d8bc09f7d63af39
Reviewed-on: https://chromium-review.googlesource.com/c/1313075Reviewed-by: Scott Chen <scottchen@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604769}

chrome/browser/browser_resources.grd

@@ -663,43 +663,6 @@
       <if expr="is_win">
         <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/broker/nacl_broker_manifest.json" type="BINDATA" />
       </if>
-      <if expr="not is_android and not chromeos">
-        <include name="IDR_NUX_EMAIL_AOL_1X" file="resources\welcome\onboarding_welcome\images\aol_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_AOL_2X" file="resources\welcome\onboarding_welcome\images\aol_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_GMAIL_1X" file="resources\welcome\onboarding_welcome\images\gmail_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_GMAIL_2X" file="resources\welcome\onboarding_welcome\images\gmail_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_ICLOUD_1X" file="resources\welcome\onboarding_welcome\images\icloud_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_ICLOUD_2X" file="resources\welcome\onboarding_welcome\images\icloud_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_OUTLOOK_1X" file="resources\welcome\onboarding_welcome\images\outlook_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_OUTLOOK_2X" file="resources\welcome\onboarding_welcome\images\outlook_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_PROVIDER_LOGO_1X" file="resources\welcome\onboarding_welcome\images\email_provider_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_PROVIDER_LOGO_2X" file="resources\welcome\onboarding_welcome\images\email_provider_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_YAHOO_1X" file="resources\welcome\onboarding_welcome\images\yahoo_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_EMAIL_YAHOO_2X" file="resources\welcome\onboarding_welcome\images\yahoo_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_CHROME_STORE_1X" file="resources\welcome\onboarding_welcome\images\chrome_store_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_CHROME_STORE_2X" file="resources\welcome\onboarding_welcome\images\chrome_store_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_LOGO_1X" file="resources\welcome\onboarding_welcome\images\google_apps_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_LOGO_2X" file="resources\welcome\onboarding_welcome\images\google_apps_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_MAPS_1X" file="resources\welcome\onboarding_welcome\images\maps_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_MAPS_2X" file="resources\welcome\onboarding_welcome\images\maps_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_NEWS_1X" file="resources\welcome\onboarding_welcome\images\news_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_NEWS_2X" file="resources\welcome\onboarding_welcome\images\news_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_TRANSLATE_1X" file="resources\welcome\onboarding_welcome\images\translate_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_TRANSLATE_2X" file="resources\welcome\onboarding_welcome\images\translate_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_YOUTUBE_1X" file="resources\welcome\onboarding_welcome\images\youtube_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_YOUTUBE_2X" file="resources\welcome\onboarding_welcome\images\youtube_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_SET_AS_DEFAULT_LOGO_1X" file="resources\welcome\onboarding_welcome\images\set_as_default_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_SET_AS_DEFAULT_LOGO_2X" file="resources\welcome\onboarding_welcome\images\set_as_default_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_SET_AS_DEFAULT_ILLUSTRATION_1X" file="resources\welcome\onboarding_welcome\images\set_as_default_illustration_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_SET_AS_DEFAULT_ILLUSTRATION_2X" file="resources\welcome\onboarding_welcome\images\set_as_default_illustration_2x.png" type="BINDATA" />
-        <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_BLUE_CIRCLE_SVG" file="resources\welcome\onboarding_welcome\images\background_svgs\blue_circle.svg" type="BINDATA" />
-        <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREEN_RECTANGLE_SVG" file="resources\welcome\onboarding_welcome\images\background_svgs\green_rectangle.svg" type="BINDATA" />
-        <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_OVAL_SVG" file="resources\welcome\onboarding_welcome\images\background_svgs\grey_oval.svg" type="BINDATA" />
-        <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_ROUNDED_RECTANGLE_SVG" file="resources\welcome\onboarding_welcome\images\background_svgs\grey_rounded_rectangle.svg" type="BINDATA" />
-        <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_RED_TRIANGLE_SVG" file="resources\welcome\onboarding_welcome\images\background_svgs\red_triangle.svg" type="BINDATA" />
-        <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_DOTS_SVG" file="resources\welcome\onboarding_welcome\images\background_svgs\yellow_dots.svg" type="BINDATA" />
-        <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_SEMICIRCLE_SVG" file="resources\welcome\onboarding_welcome\images\background_svgs\yellow_semicircle.svg" type="BINDATA" />
-      </if>
       <if expr="is_win">
         <include name="IDR_WELCOME_WIN10_DEFAULT_WEBP" file="resources\welcome\default.webp" type="BINDATA" />
         <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" />

chrome/browser/resources/welcome/onboarding_welcome/email/email_chooser.html

@@ -19,32 +19,32 @@
     <style include="chooser-shared-css paper-button-style">
       .gmail {
         background-image: -webkit-image-set(
-            url(chrome://welcome/email/gmail_1x.png) 1x,
-            url(chrome://welcome/email/gmail_2x.png) 2x);
+            url(chrome://welcome/images/gmail_1x.png) 1x,
+            url(chrome://welcome/images/gmail_2x.png) 2x);
       }
 
       .yahoo {
         background-image: -webkit-image-set(
-            url(chrome://welcome/email/yahoo_1x.png) 1x,
-            url(chrome://welcome/email/yahoo_2x.png) 2x);
+            url(chrome://welcome/images/yahoo_1x.png) 1x,
+            url(chrome://welcome/images/yahoo_2x.png) 2x);
       }
 
       .aol {
         background-image: -webkit-image-set(
-            url(chrome://welcome/email/aol_1x.png) 1x,
-            url(chrome://welcome/email/aol_2x.png) 2x);
+            url(chrome://welcome/images/aol_1x.png) 1x,
+            url(chrome://welcome/images/aol_2x.png) 2x);
       }
 
       .icloud {
         background-image: -webkit-image-set(
-            url(chrome://welcome/email/icloud_1x.png) 1x,
-            url(chrome://welcome/email/icloud_2x.png) 2x);
+            url(chrome://welcome/images/icloud_1x.png) 1x,
+            url(chrome://welcome/images/icloud_2x.png) 2x);
       }
 
       .outlook {
         background-image: -webkit-image-set(
-            url(chrome://welcome/email/outlook_1x.png) 1x,
-            url(chrome://welcome/email/outlook_2x.png) 2x);
+            url(chrome://welcome/images/outlook_1x.png) 1x,
+            url(chrome://welcome/images/outlook_2x.png) 2x);
       }
 
       iron-icon[icon='cr:chevron-right'] {

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

@@ -16,38 +16,38 @@
     <style include="chooser-shared-css">
       .gmail {
         content: -webkit-image-set(
-            url(chrome://welcome/google_apps/gmail_1x.png) 1x,
-            url(chrome://welcome/google_apps/gmail_2x.png) 2x);
+            url(chrome://welcome/images/gmail_1x.png) 1x,
+            url(chrome://welcome/images/gmail_2x.png) 2x);
       }
 
       .youtube {
         content: -webkit-image-set(
-            url(chrome://welcome/google_apps/youtube_1x.png) 1x,
-            url(chrome://welcome/google_apps/youtube_2x.png) 2x);
+            url(chrome://welcome/images/youtube_1x.png) 1x,
+            url(chrome://welcome/images/youtube_2x.png) 2x);
       }
 
       .maps {
         content: -webkit-image-set(
-            url(chrome://welcome/google_apps/maps_1x.png) 1x,
-            url(chrome://welcome/google_apps/maps_2x.png) 2x);
+            url(chrome://welcome/images/maps_1x.png) 1x,
+            url(chrome://welcome/images/maps_2x.png) 2x);
       }
 
       .translate {
         content: -webkit-image-set(
-            url(chrome://welcome/google_apps/translate_1x.png) 1x,
-            url(chrome://welcome/google_apps/translate_2x.png) 2x);
+            url(chrome://welcome/images/translate_1x.png) 1x,
+            url(chrome://welcome/images/translate_2x.png) 2x);
       }
 
       .news {
         content: -webkit-image-set(
-            url(chrome://welcome/google_apps/news_1x.png) 1x,
-            url(chrome://welcome/google_apps/news_2x.png) 2x);
+            url(chrome://welcome/images/news_1x.png) 1x,
+            url(chrome://welcome/images/news_2x.png) 2x);
       }
 
       .web-store {
         content: -webkit-image-set(
-            url(chrome://welcome/google_apps/chrome_store_1x.png) 1x,
-            url(chrome://welcome/google_apps/chrome_store_2x.png) 2x);
+            url(chrome://welcome/images/chrome_store_1x.png) 1x,
+            url(chrome://welcome/images/chrome_store_2x.png) 2x);
       }
     </style>
 

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

@@ -20,8 +20,8 @@
 
       .chrome-logo {
         content: -webkit-image-set(
-            url(chrome://welcome/google_apps/google_apps_1x.png) 1x,
-            url(chrome://welcome/google_apps/google_apps_2x.png) 2x);
+            url(chrome://welcome/images/google_apps_1x.png) 1x,
+            url(chrome://welcome/images/google_apps_2x.png) 2x);
         height: 38px;
         margin-bottom: 16px;
         margin-left: auto;

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

@@ -11,6 +11,43 @@
     <output filename="onboarding_welcome_resources.pak" type="data_package" />
   </outputs>
   <release seq="1">
+    <includes>
+      <include name="IDR_NUX_EMAIL_AOL_1X" file="images\aol_1x.png" type="BINDATA"/>
+      <include name="IDR_NUX_EMAIL_AOL_2X" file="images\aol_2x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_GMAIL_1X" file="images\gmail_1x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_GMAIL_2X" file="images\gmail_2x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_ICLOUD_1X" file="images\icloud_1x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_ICLOUD_2X" file="images\icloud_2x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_OUTLOOK_1X" file="images\outlook_1x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_OUTLOOK_2X" file="images\outlook_2x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_PROVIDER_LOGO_1X" file="images\email_provider_1x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_PROVIDER_LOGO_2X" file="images\email_provider_2x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_YAHOO_1X" file="images\yahoo_1x.png" type="BINDATA" />
+      <include name="IDR_NUX_EMAIL_YAHOO_2X" file="images\yahoo_2x.png" type="BINDATA" />
+      <include name="IDR_NUX_GOOGLE_APPS_CHROME_STORE_1X" file="images\chrome_store_1x.png" type="BINDATA" />
+      <include name="IDR_NUX_GOOGLE_APPS_CHROME_STORE_2X" file="images\chrome_store_2x.png" type="BINDATA" />
+      <include name="IDR_NUX_GOOGLE_APPS_LOGO_1X" file="images\google_apps_1x.png" type="BINDATA" />
+      <include name="IDR_NUX_GOOGLE_APPS_LOGO_2X" file="images\google_apps_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_SET_AS_DEFAULT_ILLUSTRATION_1X" file="images\set_as_default_illustration_1x.png" type="BINDATA" />
+      <include name="IDR_NUX_SET_AS_DEFAULT_ILLUSTRATION_2X" file="images\set_as_default_illustration_2x.png" type="BINDATA" />
+      <include name="IDR_NUX_SET_AS_DEFAULT_LOGO_1X" file="images\set_as_default_1x.png" type="BINDATA" />
+      <include name="IDR_NUX_SET_AS_DEFAULT_LOGO_2X" file="images\set_as_default_2x.png" type="BINDATA" />
+      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_BLUE_CIRCLE_SVG" file="images\background_svgs\blue_circle.svg" type="BINDATA" />
+      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREEN_RECTANGLE_SVG" file="images\background_svgs\green_rectangle.svg" type="BINDATA" />
+      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_OVAL_SVG" file="images\background_svgs\grey_oval.svg" type="BINDATA" />
+      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_ROUNDED_RECTANGLE_SVG" file="images\background_svgs\grey_rounded_rectangle.svg" type="BINDATA" />
+      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_RED_TRIANGLE_SVG" file="images\background_svgs\red_triangle.svg" type="BINDATA" />
+      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_DOTS_SVG" file="images\background_svgs\yellow_dots.svg" type="BINDATA" />
+      <include name="IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_SEMICIRCLE_SVG" file="images\background_svgs\yellow_semicircle.svg" type="BINDATA" />
+    </includes>
     <structures>
       <structure name="IDR_WELCOME_ONBOARDING_WELCOME_EMAIL_INTERSTITIAL_HTML"
                  file="email_interstitial.html"

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

@@ -12,8 +12,8 @@
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/welcome/nux/bookmark_item.h"
-#include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/grit/onboarding_welcome_resources.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/grit/components_resources.h"
 #include "components/grit/components_scaled_resources.h"
@@ -109,20 +109,6 @@ void EmailHandler::HandleGetEmailList(const base::ListValue* args) {
 }
 
 void EmailHandler::AddSources(content::WebUIDataSource* html_source) {
-  // Add icons
-  html_source->AddResourcePath("email/aol_1x.png", IDR_NUX_EMAIL_AOL_1X);
-  html_source->AddResourcePath("email/aol_2x.png", IDR_NUX_EMAIL_AOL_2X);
-  html_source->AddResourcePath("email/gmail_1x.png", IDR_NUX_EMAIL_GMAIL_1X);
-  html_source->AddResourcePath("email/gmail_2x.png", IDR_NUX_EMAIL_GMAIL_2X);
-  html_source->AddResourcePath("email/icloud_1x.png", IDR_NUX_EMAIL_ICLOUD_1X);
-  html_source->AddResourcePath("email/icloud_2x.png", IDR_NUX_EMAIL_ICLOUD_2X);
-  html_source->AddResourcePath("email/outlook_1x.png",
-                               IDR_NUX_EMAIL_OUTLOOK_1X);
-  html_source->AddResourcePath("email/outlook_2x.png",
-                               IDR_NUX_EMAIL_OUTLOOK_2X);
-  html_source->AddResourcePath("email/yahoo_1x.png", IDR_NUX_EMAIL_YAHOO_1X);
-  html_source->AddResourcePath("email/yahoo_2x.png", IDR_NUX_EMAIL_YAHOO_2X);
-
   // Add constants to loadtime data
   html_source->AddInteger("email_providers_count",
                           static_cast<int>(EmailProviders::kCount));

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

@@ -11,15 +11,14 @@
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/welcome/nux/bookmark_item.h"
-#include "chrome/grit/browser_resources.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/grit/onboarding_welcome_resources.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/grit/components_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
-#include "content/public/browser/web_ui_data_source.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace nux {
@@ -108,37 +107,4 @@ void GoogleAppsHandler::HandleGetGoogleAppsList(const base::ListValue* args) {
       bookmarkItemsToListValue(kGoogleApps, base::size(kGoogleApps)));
 }
 
-void GoogleAppsHandler::AddSources(content::WebUIDataSource* html_source) {
-  // Add icons
-  html_source->AddResourcePath("google_apps/chrome_store_1x.png",
-                               IDR_NUX_GOOGLE_APPS_CHROME_STORE_1X);
-  html_source->AddResourcePath("google_apps/chrome_store_2x.png",
-                               IDR_NUX_GOOGLE_APPS_CHROME_STORE_2X);
-  // TODO: rename and centralize to make it easier to share icons between NUX.
-  html_source->AddResourcePath("google_apps/gmail_1x.png",
-                               IDR_NUX_EMAIL_GMAIL_1X);
-  html_source->AddResourcePath("google_apps/gmail_2x.png",
-                               IDR_NUX_EMAIL_GMAIL_2X);
-  html_source->AddResourcePath("google_apps/google_apps_1x.png",
-                               IDR_NUX_GOOGLE_APPS_LOGO_1X);
-  html_source->AddResourcePath("google_apps/google_apps_2x.png",
-                               IDR_NUX_GOOGLE_APPS_LOGO_2X);
-  html_source->AddResourcePath("google_apps/maps_1x.png",
-                               IDR_NUX_GOOGLE_APPS_MAPS_1X);
-  html_source->AddResourcePath("google_apps/maps_2x.png",
-                               IDR_NUX_GOOGLE_APPS_MAPS_2X);
-  html_source->AddResourcePath("google_apps/news_1x.png",
-                               IDR_NUX_GOOGLE_APPS_NEWS_1X);
-  html_source->AddResourcePath("google_apps/news_2x.png",
-                               IDR_NUX_GOOGLE_APPS_NEWS_2X);
-  html_source->AddResourcePath("google_apps/translate_1x.png",
-                               IDR_NUX_GOOGLE_APPS_TRANSLATE_1X);
-  html_source->AddResourcePath("google_apps/translate_2x.png",
-                               IDR_NUX_GOOGLE_APPS_TRANSLATE_2X);
-  html_source->AddResourcePath("google_apps/youtube_1x.png",
-                               IDR_NUX_GOOGLE_APPS_YOUTUBE_1X);
-  html_source->AddResourcePath("google_apps/youtube_2x.png",
-                               IDR_NUX_GOOGLE_APPS_YOUTUBE_2X);
-}
-
 }  // namespace nux

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

@@ -9,10 +9,6 @@
 #include "base/values.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
-namespace content {
-class WebUIDataSource;
-}  // namespace content
-
 namespace nux {
 
 extern const char* kGoogleAppsInteractionHistogram;
@@ -38,9 +34,6 @@ class GoogleAppsHandler : public content::WebUIMessageHandler {
   void HandleCacheGoogleAppIcon(const base::ListValue* args);
   void HandleGetGoogleAppsList(const base::ListValue* args);
 
-  // Adds webui sources.
-  static void AddSources(content::WebUIDataSource* html_source);
-
   DISALLOW_COPY_AND_ASSIGN(GoogleAppsHandler);
 };
 

chrome/browser/ui/webui/welcome/welcome_ui.cc

@@ -152,41 +152,6 @@ WelcomeUI::WelcomeUI(content::WebUI* web_ui, const GURL& url)
         "email-interstitial",
         IDR_WELCOME_ONBOARDING_WELCOME_EMAIL_INTERSTITIAL_HTML);
 
-    html_source->AddResourcePath(
-        "images/background_svgs/blue_circle.svg",
-        IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_BLUE_CIRCLE_SVG);
-    html_source->AddResourcePath(
-        "images/background_svgs/green_rectangle.svg",
-        IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREEN_RECTANGLE_SVG);
-    html_source->AddResourcePath(
-        "images/background_svgs/grey_oval.svg",
-        IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_OVAL_SVG);
-    html_source->AddResourcePath(
-        "images/background_svgs/grey_rounded_rectangle.svg",
-        IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_GREY_ROUNDED_RECTANGLE_SVG);
-    html_source->AddResourcePath(
-        "images/background_svgs/red_triangle.svg",
-        IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_RED_TRIANGLE_SVG);
-    html_source->AddResourcePath(
-        "images/background_svgs/yellow_dots.svg",
-        IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_DOTS_SVG);
-    html_source->AddResourcePath(
-        "images/background_svgs/yellow_semicircle.svg",
-        IDR_WELCOME_ONBOARDING_WELCOME_IMAGES_BACKGROUND_SVGS_YELLOW_SEMICIRCLE_SVG);
-
-    html_source->AddResourcePath("images/email_provider_1x.png",
-                                 IDR_NUX_EMAIL_PROVIDER_LOGO_1X);
-    html_source->AddResourcePath("images/email_provider_2x.png",
-                                 IDR_NUX_EMAIL_PROVIDER_LOGO_2X);
-    html_source->AddResourcePath("images/set_as_default_1x.png",
-                                 IDR_NUX_SET_AS_DEFAULT_LOGO_1X);
-    html_source->AddResourcePath("images/set_as_default_2x.png",
-                                 IDR_NUX_SET_AS_DEFAULT_LOGO_2X);
-    html_source->AddResourcePath("images/set_as_default_illustration_1x.png",
-                                 IDR_NUX_SET_AS_DEFAULT_ILLUSTRATION_1X);
-    html_source->AddResourcePath("images/set_as_default_illustration_2x.png",
-                                 IDR_NUX_SET_AS_DEFAULT_ILLUSTRATION_2X);
-
 #if defined(OS_WIN)
     html_source->AddBoolean(
         "is_win10", base::win::GetVersion() >= base::win::VERSION_WIN10);
@@ -202,7 +167,6 @@ WelcomeUI::WelcomeUI(content::WebUI* web_ui, const GURL& url)
 
     // Add google apps bookmarking onboarding module.
     web_ui->AddMessageHandler(std::make_unique<nux::GoogleAppsHandler>());
-    nux::GoogleAppsHandler::AddSources(html_source);
 
     // Add set-as-default onboarding module.
     web_ui->AddMessageHandler(std::make_unique<nux::SetAsDefaultHandler>());

tools/gritsettings/resource_ids

@@ -131,20 +131,21 @@
     "includes": [13320],
   },
   "chrome/browser/resources/welcome/onboarding_welcome/onboarding_welcome_resources.grd": {
-    "structures": [13330],
+    "includes": [13330],
+    "structures": [13380],
   },
   "chrome/browser/vr/testapp/vr_testapp_resources.grd": {
-    "includes": [13370],
+    "includes": [13420],
   },
   # END chrome/browser section.
 
   # START chrome/ miscellaneous section.
   "chrome/common/common_resources.grd": {
-    "includes": [13380],
+    "includes": [13430],
   },
   "chrome/credential_provider/gaiacp/gaia_resources.grd": {
-    "includes": [13400],
-    "messages": [13410],
+    "includes": [13450],
+    "messages": [13460],
   },
   "chrome/renderer/resources/renderer_resources.grd": {
     "includes": [13500],