Navi: Update NUX Google Apps Icons to be higher resolution.

Bug: 874118
Change-Id: Id5e57c2667e1b7c1b8f11a132a51c1ecc377a444
Reviewed-on: https://chromium-review.googlesource.com/1246153Reviewed-by: Scott Chen <scottchen@chromium.org>
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596268}

chrome/browser/browser_resources.grd

@@ -699,18 +699,16 @@
         <include name="IDR_NUX_EMAIL_OUTLOOK_2X" file="resources\welcome\onboarding_welcome\images\outlook_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_24dp_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_CHROME_STORE_2X" file="resources\welcome\onboarding_welcome\images\chrome_store_24dp_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_GMAIL_1X" file="resources\welcome\onboarding_welcome\images\gmail_24dp_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_GMAIL_2X" file="resources\welcome\onboarding_welcome\images\gmail_24dp_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_MAPS_1X" file="resources\welcome\onboarding_welcome\images\maps_24dp_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_MAPS_2X" file="resources\welcome\onboarding_welcome\images\maps_24dp_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_NEWS_1X" file="resources\welcome\onboarding_welcome\images\news_24dp_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_NEWS_2X" file="resources\welcome\onboarding_welcome\images\news_24dp_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_TRANSLATE_1X" file="resources\welcome\onboarding_welcome\images\translate_24dp_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_TRANSLATE_2X" file="resources\welcome\onboarding_welcome\images\translate_24dp_2x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_YOUTUBE_1X" file="resources\welcome\onboarding_welcome\images\youtube_24dp_1x.png" type="BINDATA" />
-        <include name="IDR_NUX_GOOGLE_APPS_YOUTUBE_2X" file="resources\welcome\onboarding_welcome\images\youtube_24dp_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_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" />
       </if>
       <if expr="is_win">
         <include name="IDR_WELCOME_WIN10_DEFAULT_WEBP" file="resources\welcome\default.webp" type="BINDATA" />

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

@@ -56,7 +56,7 @@ constexpr const char* kGoogleAppUrls[] = {
 
 constexpr const int kGoogleAppIconSize = 48;  // Pixels.
 constexpr const int kGoogleAppIcons[] = {
-    IDR_NUX_GOOGLE_APPS_GMAIL_1X, IDR_NUX_GOOGLE_APPS_YOUTUBE_1X,
+    IDR_NUX_EMAIL_GMAIL_1X, IDR_NUX_GOOGLE_APPS_YOUTUBE_1X,
     IDR_NUX_GOOGLE_APPS_MAPS_1X,  IDR_NUX_GOOGLE_APPS_TRANSLATE_1X,
     IDR_NUX_GOOGLE_APPS_NEWS_1X,  IDR_NUX_GOOGLE_APPS_CHROME_STORE_1X,
 };
@@ -162,10 +162,11 @@ void GoogleAppsHandler::AddSources(content::WebUIDataSource* html_source) {
                                IDR_NUX_GOOGLE_APPS_CHROME_STORE_1X);
   html_source->AddResourcePath("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("apps/gmail_1x.png",
-                               IDR_NUX_GOOGLE_APPS_GMAIL_1X);
+                               IDR_NUX_EMAIL_GMAIL_1X);
   html_source->AddResourcePath("apps/gmail_2x.png",
-                               IDR_NUX_GOOGLE_APPS_GMAIL_2X);
+                               IDR_NUX_EMAIL_GMAIL_2X);
   html_source->AddResourcePath("apps/maps_1x.png", IDR_NUX_GOOGLE_APPS_MAPS_1X);
   html_source->AddResourcePath("apps/maps_2x.png", IDR_NUX_GOOGLE_APPS_MAPS_2X);
   html_source->AddResourcePath("apps/news_1x.png", IDR_NUX_GOOGLE_APPS_NEWS_1X);
@@ -180,4 +181,4 @@ void GoogleAppsHandler::AddSources(content::WebUIDataSource* html_source) {
                                IDR_NUX_GOOGLE_APPS_YOUTUBE_2X);
 }
 
-}  // namespace nux
\ No newline at end of file
+}  // namespace nux