Commit 7a0fdd9e authored by Rachel Carpenter's avatar Rachel Carpenter Committed by Commit Bot

Remove Genius app.

All entry points were deleted several milestones ago, and the component
extension has been uninstalled for anyone who has updated to either of
the milestones in the interim.

Actual code for the app lives elsewhere, will also be deleted.

Bug: b/159863346
Change-Id: I2792ea8d9482b9199b4dc6a394a8f659d176108b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2454960
Commit-Queue: Rachel Carpenter <carpenterr@chromium.org>
Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815489}
parent 231b351f
...@@ -3048,9 +3048,6 @@ ...@@ -3048,9 +3048,6 @@
<message name="IDS_GENIUS_APP_NAME" desc="Name of the genius app in the app shelf"> <message name="IDS_GENIUS_APP_NAME" desc="Name of the genius app in the app shelf">
Get Help Get Help
</message> </message>
<message name="IDS_GENIUS_APP_DESCRIPTION" desc="Description of the genius app in the app shelf">
Get help with your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>.
</message>
<message name="IDS_FILEMANAGER_APP_NAME" desc="Name for the File Manager app."> <message name="IDS_FILEMANAGER_APP_NAME" desc="Name for the File Manager app.">
Files Files
</message> </message>
......
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
<include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_host\authenticator.js" flattenhtml="true" type="BINDATA" /> <include name="IDR_GAIA_AUTH_AUTHENTICATOR_JS" file="resources\gaia_auth_host\authenticator.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_LOCK_SCREEN_REAUTH_HTML" file="resources\chromeos\password_change\lock_screen_reauth.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_LOCK_SCREEN_REAUTH_HTML" file="resources\chromeos\password_change\lock_screen_reauth.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_LOCK_SCREEN_REAUTH_JS" file="resources\chromeos\password_change\lock_screen_reauth.js" type="BINDATA" /> <include name="IDR_LOCK_SCREEN_REAUTH_JS" file="resources\chromeos\password_change\lock_screen_reauth.js" type="BINDATA" />
<include name="IDR_CROSTINI_INSTALLER_INDEX_HTML" file="resources\chromeos\crostini_installer\index.html" type="BINDATA" /> <include name="IDR_CROSTINI_INSTALLER_INDEX_HTML" file="resources\chromeos\crostini_installer\index.html" type="BINDATA" />
<include name="IDR_CROSTINI_INSTALLER_APP_JS" file="${root_gen_dir}\chrome\browser\resources\chromeos\crostini_installer\app.js" type="BINDATA" use_base_dir="false" /> <include name="IDR_CROSTINI_INSTALLER_APP_JS" file="${root_gen_dir}\chrome\browser\resources\chromeos\crostini_installer\app.js" type="BINDATA" use_base_dir="false" />
<include name="IDR_CROSTINI_INSTALLER_BROWSER_PROXY_JS" file="resources\chromeos\crostini_installer\browser_proxy.js" type="BINDATA" /> <include name="IDR_CROSTINI_INSTALLER_BROWSER_PROXY_JS" file="resources\chromeos\crostini_installer\browser_proxy.js" type="BINDATA" />
...@@ -324,7 +324,6 @@ ...@@ -324,7 +324,6 @@
<include name="IDR_ARC_SUPPORT_MANIFEST" file="resources\chromeos\arc_support\manifest.json" type="BINDATA" /> <include name="IDR_ARC_SUPPORT_MANIFEST" file="resources\chromeos\arc_support\manifest.json" type="BINDATA" />
</if> </if>
<if expr="chromeos and _google_chrome"> <if expr="chromeos and _google_chrome">
<include name="IDR_GENIUS_APP_MANIFEST" file="resources\chromeos\genius_app\manifest.json" type="BINDATA" />
<include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" /> <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" />
<include name="IDR_QUICKOFFICE_MANIFEST" file="resources\chromeos\quickoffice\manifest.json" type="BINDATA" /> <include name="IDR_QUICKOFFICE_MANIFEST" file="resources\chromeos\quickoffice\manifest.json" type="BINDATA" />
<include name="IDR_PRODUCT_CHROMEOS_SYNC_CONSENT_SCREEN_ICONS" file="internal\resources\chromeos-sync-consent-icons.html" type="BINDATA" /> <include name="IDR_PRODUCT_CHROMEOS_SYNC_CONSENT_SCREEN_ICONS" file="internal\resources\chromeos-sync-consent-icons.html" type="BINDATA" />
......
...@@ -92,7 +92,6 @@ bool IsComponentExtensionAllowlisted(int manifest_resource_id) { ...@@ -92,7 +92,6 @@ bool IsComponentExtensionAllowlisted(int manifest_resource_id) {
case IDR_VIDEO_PLAYER_MANIFEST: case IDR_VIDEO_PLAYER_MANIFEST:
case IDR_WALLPAPERMANAGER_MANIFEST: case IDR_WALLPAPERMANAGER_MANIFEST:
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
case IDR_GENIUS_APP_MANIFEST:
case IDR_HELP_MANIFEST: case IDR_HELP_MANIFEST:
case IDR_QUICKOFFICE_MANIFEST: case IDR_QUICKOFFICE_MANIFEST:
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
......
...@@ -511,23 +511,6 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( ...@@ -511,23 +511,6 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
return; return;
} }
#if defined(OS_CHROMEOS) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
// TODO(b/159863346): Delete this entirely around M88 when it has has a chance
// to be cleaned up.
if (extensions::ExtensionPrefs::Get(profile_)
->ShouldInstallObsoleteComponentExtension(
extension_misc::kGeniusAppId)) {
// Since this is a v2 Chrome app it has a background page.
AddWithNameAndDescription(
IDR_GENIUS_APP_MANIFEST,
base::FilePath(
FILE_PATH_LITERAL("/usr/share/chromeos-assets/genius_app")),
l10n_util::GetStringUTF8(IDS_GENIUS_APP_NAME),
l10n_util::GetStringFUTF8(IDS_GENIUS_APP_DESCRIPTION,
ui::GetChromeOSDeviceName()));
}
#endif
if (!skip_session_components) { if (!skip_session_components) {
#if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION)
AddHangoutServicesExtension(); AddHangoutServicesExtension();
......
...@@ -137,7 +137,9 @@ const char* const kMigratedExtensionIds[] = { ...@@ -137,7 +137,9 @@ const char* const kMigratedExtensionIds[] = {
// IDs of component extensions that have been obsoleted and need to be // IDs of component extensions that have been obsoleted and need to be
// uninstalled. // uninstalled.
// Note: We preserve at least one entry here for continued testing coverage.
const char* const kObsoleteComponentExtensionIds[] = { const char* const kObsoleteComponentExtensionIds[] = {
// Obsolete since M86.
"ljoammodoonkhnehlncldjelhidljdpi" // Genius "ljoammodoonkhnehlncldjelhidljdpi" // Genius
}; };
......
carpenterr@chromium.org
dstockwell@chromium.org
tapted@chromium.org
{
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNAtiHknM7LHSwE9YKiFFvYvsp0TkfIriWfrjz53odJD0jEbOtyNhVXqdBOdtcenbSraxt7oJ9GlIfUkvBMP5iOpcrJkYfuNJv8ANHTKC79TjGXRg76TjiqpNI+R2NiVav1pXlzYZpu0ToaiaOcr3IgoGsvIUPcC6pd1U5AjdrCQIDAQAB",
"manifest_version": 2,
"name": "__MSG_app_name__",
"description": "__MSG_app_description__",
"version": "0.4",
"minimum_chrome_version": "28",
"default_locale": "en",
"incognito" : "split",
"icons": {
"16": "icon/16.png",
"32": "icon/32.png",
"48": "icon/48.png",
"64": "icon/64.png",
"96": "icon/96.png",
"128": "icon/128.png",
"256": "icon/256.png"
},
"app": {
"background": {
"persistent": false,
"page": "background.html"
}
},
"permissions": [
"identity",
"identity.email",
"chromeosInfoPrivate",
"fileSystem",
"firstRunPrivate",
"management",
"metricsPrivate",
"webview",
"storage",
"unlimitedStorage",
"https://*.ytimg.com/*",
"https://www.google.com/*",
"https://support.google.com/*",
"https://scone-pa.clients6.google.com/*",
"https://commondatastorage.googleapis.com/*",
"https://storage.googleapis.com/*",
"https://www.google-analytics.com/"
],
"oauth2": {
"client_id": "929143421683.apps.googleusercontent.com",
"scopes": [
"https://www.googleapis.com/auth/supportcontent",
"https://www.googleapis.com/auth/cases",
"https://www.googleapis.com/auth/cases.readonly",
"https://www.googleapis.com/auth/pixelbook.email.preferences",
"https://www.google.com/accounts/OAuthLogin"
]
},
"display_in_new_tab_page": false,
"url_handlers": {
"view_answer": {
"matches": [
"https://support.google.com/chromeos-gethelp/answer/*"
],
"title": "Open Help Article"
},
"home": {
"matches": [
"https://support.google.com/chromeos-gethelp",
"https://support.google.com/chromeos-gethelp/"
],
"title": "Open Help"
}
}
}
...@@ -131,7 +131,6 @@ const char kGoogleSheetsDemoAppId[] = "nifkmgcdokhkjghdlgflonppnefddien"; ...@@ -131,7 +131,6 @@ const char kGoogleSheetsDemoAppId[] = "nifkmgcdokhkjghdlgflonppnefddien";
const char kGoogleSlidesDemoAppId[] = "hdmobeajeoanbanmdlabnbnlopepchip"; const char kGoogleSlidesDemoAppId[] = "hdmobeajeoanbanmdlabnbnlopepchip";
const char kGoogleKeepAppId[] = "hmjkmjkepdijhoojdojkdfohbdgmmhki"; const char kGoogleKeepAppId[] = "hmjkmjkepdijhoojdojkdfohbdgmmhki";
const char kYoutubeAppId[] = "blpcfgokakmgnkcojhhkbfbldkacnbeo"; const char kYoutubeAppId[] = "blpcfgokakmgnkcojhhkbfbldkacnbeo";
const char kGeniusAppId[] = "ljoammodoonkhnehlncldjelhidljdpi";
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// TODO(michaelpg): Deprecate old app IDs before adding new ones to avoid bloat. // TODO(michaelpg): Deprecate old app IDs before adding new ones to avoid bloat.
......
...@@ -236,9 +236,6 @@ extern const char kGoogleKeepAppId[]; ...@@ -236,9 +236,6 @@ extern const char kGoogleKeepAppId[];
// The extension id of the Youtube application. // The extension id of the Youtube application.
extern const char kYoutubeAppId[]; extern const char kYoutubeAppId[];
// The extension id of the genius (Get Help) app.
extern const char kGeniusAppId[];
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// The extension id of the default Demo Mode Highlights app. // The extension id of the default Demo Mode Highlights app.
extern const char kHighlightsAppId[]; extern const char kHighlightsAppId[];
......
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