commit | fe5e9c2a6cbf0d6d2028bd3c8f4a684ac958fb36 | [log] [tgz] |
---|---|---|
author | Alan Cutter <[email protected]> | Mon Nov 16 08:21:59 2020 |
committer | Commit Bot <[email protected]> | Mon Nov 16 08:21:59 2020 |
tree | 2d1d2fa81ff1314d6d41c1a59ba84e152e1d780b | |
parent | 550f9f68f9bf41934190978ca416ffb5e4d8b1e8 [diff] [blame] |
Migrate remaining preinstalled web apps from Chrome OS JSON to C++ This CL is a follow up to https://chromium-review.googlesource.com/c/chromium/src/+/2524809/ where the remaining default installed Chrome apps are migrated over to preinstalled web apps: - Gmail - Google Docs - Google Drive - Google Sheets - Google Slides - YouTube This copies the JSON configs in https://chrome-internal.googlesource.com/chromeos/overlays/chromeos-overlay/+/master/chromeos-base/chromeos-default-apps/files/web_apps/docs.json to C++ in the Chrome binary. The JSON configs will be removed in a follow up CL to avoid data duplication in multiple locations and formats. The icons used by these default apps are stored in an internal repository: https://chrome-internal.googlesource.com/chrome/components/default_apps/+/refs/heads/main Bug: 1104692 Change-Id: I51ea68b0d1a9c0d25e1edfb4fc5b3557643b562e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2525886 Reviewed-by: calamity <[email protected]> Reviewed-by: Devlin <[email protected]> Reviewed-by: Glen Robertson <[email protected]> Commit-Queue: Alan Cutter <[email protected]> Cr-Commit-Position: refs/heads/master@{#827716}
diff --git a/chrome/browser/resources/preinstalled_web_apps/resources.grd b/chrome/browser/resources/preinstalled_web_apps/resources.grd index 23a0b65..d595e961 100644 --- a/chrome/browser/resources/preinstalled_web_apps/resources.grd +++ b/chrome/browser/resources/preinstalled_web_apps/resources.grd
@@ -4,10 +4,20 @@ <output filename="grit/preinstalled_web_apps_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> + <output filename="grit/preinstalled_web_apps_resources_map.cc" + type="resource_file_map_source" /> + <output filename="grit/preinstalled_web_apps_resources_map.h" + type="resource_map_header" /> <output filename="preinstalled_web_apps_resources.pak" type="data_package" /> </outputs> <release seq="1"> <includes> + <include name="IDR_PREINSTALLED_WEB_APPS_GOOGLE_DOCS_ICON_192_PNG" file="internal/google_docs_192.png" type="BINDATA" /> + <include name="IDR_PREINSTALLED_WEB_APPS_GOOGLE_DRIVE_ICON_192_PNG" file="internal/google_drive_192.png" type="BINDATA" /> + <include name="IDR_PREINSTALLED_WEB_APPS_GOOGLE_SHEETS_ICON_192_PNG" file="internal/google_sheets_192.png" type="BINDATA" /> + <include name="IDR_PREINSTALLED_WEB_APPS_GOOGLE_SLIDES_ICON_192_PNG" file="internal/google_slides_192.png" type="BINDATA" /> + <include name="IDR_PREINSTALLED_WEB_APPS_GMAIL_ICON_192_PNG" file="internal/gmail_192.png" type="BINDATA" /> + <include name="IDR_PREINSTALLED_WEB_APPS_YOUTUBE_ICON_192_PNG" file="internal/youtube_192.png" type="BINDATA" /> </includes> </release> </grit>