Commit a68cff93 authored by Rachel Carpenter's avatar Rachel Carpenter Committed by Chromium LUCI CQ

Remove references to the Release notes PWA.

This has been replaced with a tab in the Help App.

Bug: b/171516802
Change-Id: I4ec4ec23a33238ae389c666e0a25c872fcf437c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2558080
Commit-Queue: Rachel Carpenter <carpenterr@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarNancy Wang <nancylingwang@chromium.org>
Reviewed-by: default avatarAlan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832098}
parent 75cff10e
...@@ -22,11 +22,6 @@ constexpr char kInternalAppIdSettings[] = "dhnmfjegnohoakobpikffnelcemaplkm"; ...@@ -22,11 +22,6 @@ constexpr char kInternalAppIdSettings[] = "dhnmfjegnohoakobpikffnelcemaplkm";
constexpr char kInternalAppIdContinueReading[] = constexpr char kInternalAppIdContinueReading[] =
"fbokpncipdhffndmljhhidahghagaonp"; "fbokpncipdhffndmljhhidahghagaonp";
// Generated as
// web_app::GenerateAppIdFromURL(GURL(
// "https://google.com/chromebook/whatsnew/embedded/")).
constexpr char kReleaseNotesAppId[] = "kddjchdmnnpakappplfnloipgcbioilo";
} // namespace ash } // namespace ash
#endif // ASH_PUBLIC_CPP_APP_LIST_INTERNAL_APP_ID_CONSTANTS_H_ #endif // ASH_PUBLIC_CPP_APP_LIST_INTERNAL_APP_ID_CONSTANTS_H_
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<!-- CrOS internal apps images --> <!-- CrOS internal apps images -->
<include name="IDR_SHORTCUT_VIEWER_LOGO_192" file="unscaled_resources/shortcut_viewer_logo_192.png" type="BINDATA" /> <include name="IDR_SHORTCUT_VIEWER_LOGO_192" file="unscaled_resources/shortcut_viewer_logo_192.png" type="BINDATA" />
<include name="IDR_SETTINGS_LOGO_192" file="unscaled_resources/settings_logo_192.png" type="BINDATA" /> <include name="IDR_SETTINGS_LOGO_192" file="unscaled_resources/settings_logo_192.png" type="BINDATA" />
<include name="IDR_RELEASE_NOTES_APP_192" file="unscaled_resources/release_notes_logo_192.png" type="BINDATA" />
<include name="IDR_PHONE_HUB_ONBOARDING_IMAGE" file="unscaled_resources/phone_hub_onboarding_image.png" type="BINDATA" /> <include name="IDR_PHONE_HUB_ONBOARDING_IMAGE" file="unscaled_resources/phone_hub_onboarding_image.png" type="BINDATA" />
<include name="IDR_PHONE_HUB_CONNECTING_IMAGE" file="unscaled_resources/phone_hub_connecting_image.png" type="BINDATA" /> <include name="IDR_PHONE_HUB_CONNECTING_IMAGE" file="unscaled_resources/phone_hub_connecting_image.png" type="BINDATA" />
<include name="IDR_PHONE_HUB_ERROR_STATE_IMAGE" file="unscaled_resources/phone_hub_error_state_image.png" type="BINDATA" /> <include name="IDR_PHONE_HUB_ERROR_STATE_IMAGE" file="unscaled_resources/phone_hub_error_state_image.png" type="BINDATA" />
......
...@@ -5657,9 +5657,6 @@ ...@@ -5657,9 +5657,6 @@
<message name="IDS_RELEASE_NOTES_DEVICE_SPECIFIC_NOTIFICATION_TITLE" desc="Text for the notification title informing the user that the device has been updated and patch notes are available. Will specify the user's Chrome OS device."> <message name="IDS_RELEASE_NOTES_DEVICE_SPECIFIC_NOTIFICATION_TITLE" desc="Text for the notification title informing the user that the device has been updated and patch notes are available. Will specify the user's Chrome OS device.">
See what's new on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> See what's new on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph>
</message> </message>
<message name="IDS_RELEASE_NOTES_NOTIFICATION_TITLE" desc="Text for the notification title informing the user that the device has been updated and patch notes are available.">
See what's new on Chromebook
</message>
<message name="IDS_RELEASE_NOTES_NOTIFICATION_MESSAGE" desc="Text for the notification message informing the user that the device has been updated and patch notes are available."> <message name="IDS_RELEASE_NOTES_NOTIFICATION_MESSAGE" desc="Text for the notification message informing the user that the device has been updated and patch notes are available.">
Get highlights from the latest update Get highlights from the latest update
</message> </message>
......
51e6a2ba245da0527c4d1a77142448a6f9d42f35
\ No newline at end of file
...@@ -269,8 +269,6 @@ void RecordAppLaunch(const std::string& app_id, ...@@ -269,8 +269,6 @@ void RecordAppLaunch(const std::string& app_id,
} else if (app_id == plugin_vm::kPluginVmShelfAppId) { } else if (app_id == plugin_vm::kPluginVmShelfAppId) {
RecordBuiltInAppLaunch(BuiltInAppName::kPluginVm, launch_source); RecordBuiltInAppLaunch(BuiltInAppName::kPluginVm, launch_source);
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
} else if (app_id == ash::kReleaseNotesAppId) {
RecordBuiltInAppLaunch(BuiltInAppName::kReleaseNotes, launch_source);
} else if (app_id == web_app::kMockSystemAppId) { } else if (app_id == web_app::kMockSystemAppId) {
RecordDefaultAppLaunch(DefaultAppName::kMockSystemApp, launch_source); RecordDefaultAppLaunch(DefaultAppName::kMockSystemApp, launch_source);
} }
...@@ -291,9 +289,6 @@ void RecordBuiltInAppSearchResult(const std::string& app_id) { ...@@ -291,9 +289,6 @@ void RecordBuiltInAppSearchResult(const std::string& app_id) {
base::UmaHistogramEnumeration("Apps.AppListSearchResultInternalApp.Show", base::UmaHistogramEnumeration("Apps.AppListSearchResultInternalApp.Show",
BuiltInAppName::kPluginVm); BuiltInAppName::kPluginVm);
#endif // BUILDFLAG(IS_CHROMEOS_ASH) #endif // BUILDFLAG(IS_CHROMEOS_ASH)
} else if (app_id == ash::kReleaseNotesAppId) {
base::UmaHistogramEnumeration("Apps.AppListSearchResultInternalApp.Show",
BuiltInAppName::kReleaseNotes);
} }
} }
......
...@@ -11,14 +11,12 @@ ...@@ -11,14 +11,12 @@
#include "ash/public/cpp/app_list/internal_app_id_constants.h" #include "ash/public/cpp/app_list/internal_app_id_constants.h"
#include "ash/public/cpp/app_menu_constants.h" #include "ash/public/cpp/app_menu_constants.h"
#include "ash/public/cpp/keyboard_shortcut_viewer.h" #include "ash/public/cpp/keyboard_shortcut_viewer.h"
#include "base/metrics/user_metrics.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "chrome/browser/apps/app_service/app_icon_factory.h" #include "chrome/browser/apps/app_service/app_icon_factory.h"
#include "chrome/browser/apps/app_service/app_service_metrics.h" #include "chrome/browser/apps/app_service/app_service_metrics.h"
#include "chrome/browser/apps/app_service/menu_util.h" #include "chrome/browser/apps/app_service/menu_util.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/internal_app/internal_app_metadata.h" #include "chrome/browser/ui/app_list/internal_app/internal_app_metadata.h"
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/settings_window_manager_chromeos.h" #include "chrome/browser/ui/settings_window_manager_chromeos.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
#include "components/services/app_service/public/mojom/types.mojom.h" #include "components/services/app_service/public/mojom/types.mojom.h"
...@@ -126,10 +124,6 @@ void BuiltInChromeOsApps::Launch(const std::string& app_id, ...@@ -126,10 +124,6 @@ void BuiltInChromeOsApps::Launch(const std::string& app_id,
int64_t display_id) { int64_t display_id) {
if (app_id == ash::kInternalAppIdKeyboardShortcutViewer) { if (app_id == ash::kInternalAppIdKeyboardShortcutViewer) {
ash::ToggleKeyboardShortcutViewer(); ash::ToggleKeyboardShortcutViewer();
} else if (app_id == ash::kReleaseNotesAppId) {
base::RecordAction(
base::UserMetricsAction("ReleaseNotes.SuggestionChipLaunched"));
chrome::LaunchReleaseNotes(profile_, launch_source);
} }
} }
......
...@@ -21,28 +21,12 @@ ...@@ -21,28 +21,12 @@
namespace app_list { namespace app_list {
namespace {
constexpr char const* kAppIdsHiddenInLauncher[] = {web_app::kReleaseNotesAppId};
} // namespace
bool ShouldShowInLauncher(const extensions::Extension* extension, bool ShouldShowInLauncher(const extensions::Extension* extension,
content::BrowserContext* context) { content::BrowserContext* context) {
return !HideInLauncherById(extension->id()) && return chromeos::DemoSession::ShouldDisplayInAppLauncher(extension->id()) &&
chromeos::DemoSession::ShouldDisplayInAppLauncher(extension->id()) &&
extensions::ui_util::ShouldDisplayInAppLauncher(extension, context); extensions::ui_util::ShouldDisplayInAppLauncher(extension, context);
} }
bool HideInLauncherById(std::string extension_id) {
for (auto* const id : kAppIdsHiddenInLauncher) {
if (id == extension_id) {
return true;
}
}
return false;
}
void AddMenuItemIconsForSystemApps(const std::string& app_id, void AddMenuItemIconsForSystemApps(const std::string& app_id,
ui::SimpleMenuModel* menu_model, ui::SimpleMenuModel* menu_model,
int start_index, int start_index,
......
...@@ -23,7 +23,6 @@ namespace app_list { ...@@ -23,7 +23,6 @@ namespace app_list {
bool ShouldShowInLauncher(const extensions::Extension* extension, bool ShouldShowInLauncher(const extensions::Extension* extension,
content::BrowserContext* context); content::BrowserContext* context);
bool HideInLauncherById(std::string extension_id);
// chrome.contextMenus API does not support menu item icons. This function // chrome.contextMenus API does not support menu item icons. This function
// compensates for that by adding icons to menus for prominent system apps // compensates for that by adding icons to menus for prominent system apps
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#include "chrome/browser/chromeos/crostini/crostini_features.h" #include "chrome/browser/chromeos/crostini/crostini_features.h"
#include "chrome/browser/chromeos/crostini/crostini_manager.h" #include "chrome/browser/chromeos/crostini/crostini_manager.h"
#include "chrome/browser/chromeos/extensions/gfx_utils.h" #include "chrome/browser/chromeos/extensions/gfx_utils.h"
#include "chrome/browser/chromeos/release_notes/release_notes_storage.h"
#include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/session_sync_service_factory.h" #include "chrome/browser/sync/session_sync_service_factory.h"
...@@ -498,11 +497,6 @@ void AppSearchProvider::UpdateRecommendedResults( ...@@ -498,11 +497,6 @@ void AppSearchProvider::UpdateRecommendedResults(
title = navigation_title; title = navigation_title;
app->AddSearchableText(title); app->AddSearchableText(title);
} }
} else if (app->id() == ash::kReleaseNotesAppId) {
auto release_notes_storage =
std::make_unique<chromeos::ReleaseNotesStorage>(profile_);
if (!release_notes_storage->ShouldShowSuggestionChip())
continue;
} }
std::unique_ptr<AppResult> result = std::unique_ptr<AppResult> result =
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "chrome/browser/apps/app_service/app_service_metrics.h" #include "chrome/browser/apps/app_service/app_service_metrics.h"
#include "chrome/browser/apps/app_service/app_service_proxy.h" #include "chrome/browser/apps/app_service/app_service_proxy.h"
#include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h"
#include "chrome/browser/chromeos/release_notes/release_notes_storage.h"
#include "chrome/browser/favicon/large_icon_service_factory.h" #include "chrome/browser/favicon/large_icon_service_factory.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/app_list_client_impl.h" #include "chrome/browser/ui/app_list/app_list_client_impl.h"
...@@ -247,16 +246,6 @@ void AppServiceAppResult::HandleSuggestionChip(Profile* profile) { ...@@ -247,16 +246,6 @@ void AppServiceAppResult::HandleSuggestionChip(Profile* profile) {
// in the proper position. // in the proper position.
SetDisplayIndex(ash::SearchResultDisplayIndex::kFirstIndex); SetDisplayIndex(ash::SearchResultDisplayIndex::kFirstIndex);
SetDisplayType(ash::SearchResultDisplayType::kChip); SetDisplayType(ash::SearchResultDisplayType::kChip);
if (id() == ash::kReleaseNotesAppId) {
// TODO(b/169711884): Decrease times left only when the chip becomes
// visible.
chromeos::ReleaseNotesStorage(profile)
.DecreaseTimesLeftToShowSuggestionChip();
// Make sure that if both Continue Reading and Release Notes are available,
// Release Notes shows up first in the suggestion chip container.
SetPositionPriority(1.0f);
}
} }
void AppServiceAppResult::UpdateContinueReadingFavicon( void AppServiceAppResult::UpdateContinueReadingFavicon(
......
...@@ -91,15 +91,6 @@ std::unique_ptr<WebAppUiManager> WebAppUiManager::Create(Profile* profile) { ...@@ -91,15 +91,6 @@ std::unique_ptr<WebAppUiManager> WebAppUiManager::Create(Profile* profile) {
return std::make_unique<WebAppUiManagerImpl>(profile); return std::make_unique<WebAppUiManagerImpl>(profile);
} }
// static
bool WebAppUiManager::ShouldHideAppFromUser(const AppId& app_id) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
return app_list::HideInLauncherById(app_id);
#else
return false;
#endif
}
// static // static
WebAppUiManagerImpl* WebAppUiManagerImpl::Get(Profile* profile) { WebAppUiManagerImpl* WebAppUiManagerImpl::Get(Profile* profile) {
auto* provider = WebAppProvider::Get(profile); auto* provider = WebAppProvider::Get(profile);
......
...@@ -71,10 +71,6 @@ constexpr char kOsSettingsAppId[] = "odknhmnlageboeamepcngndbggdpaobj"; ...@@ -71,10 +71,6 @@ constexpr char kOsSettingsAppId[] = "odknhmnlageboeamepcngndbggdpaobj";
// "https://books.google.com/ebooks/app")) // "https://books.google.com/ebooks/app"))
constexpr char kPlayBooksAppId[] = "jglfhlbohpgcbefmhdmpancnijacbbji"; constexpr char kPlayBooksAppId[] = "jglfhlbohpgcbefmhdmpancnijacbbji";
// Generated as: web_app::GenerateAppIdFromURL(GURL(
// "https://google.com/chromebook/whatsnew/embedded/"))
constexpr char kReleaseNotesAppId[] = "lddhblppcjmenljhdleiahjighahdcje";
// Generated as: web_app::GenerateAppIdFromURL(GURL( // Generated as: web_app::GenerateAppIdFromURL(GURL(
// "chrome://settings/")) // "chrome://settings/"))
constexpr char kSettingsAppId[] = "inogagmajamaleonmanpkpkkigmklfad"; constexpr char kSettingsAppId[] = "inogagmajamaleonmanpkpkkigmklfad";
......
...@@ -29,8 +29,6 @@ class WebAppUiManager { ...@@ -29,8 +29,6 @@ class WebAppUiManager {
public: public:
static std::unique_ptr<WebAppUiManager> Create(Profile* profile); static std::unique_ptr<WebAppUiManager> Create(Profile* profile);
static bool ShouldHideAppFromUser(const AppId& app_id);
virtual ~WebAppUiManager() = default; virtual ~WebAppUiManager() = default;
virtual void SetSubsystems( virtual void SetSubsystems(
......
...@@ -266,15 +266,6 @@ std::unique_ptr<WebApp> WebAppMigrationManager::MigrateBookmarkApp( ...@@ -266,15 +266,6 @@ std::unique_ptr<WebApp> WebAppMigrationManager::MigrateBookmarkApp(
web_app->SetUserLaunchOrdinal( web_app->SetUserLaunchOrdinal(
bookmark_app_registrar_->GetUserLaunchOrdinal(app_id)); bookmark_app_registrar_->GetUserLaunchOrdinal(app_id));
if (IsChromeOs()) {
auto chromeos_data = base::make_optional<WebAppChromeOsData>();
const bool should_show = !WebAppUiManager::ShouldHideAppFromUser(app_id);
chromeos_data->show_in_launcher = should_show;
chromeos_data->show_in_search = should_show;
chromeos_data->show_in_management = should_show;
web_app->SetWebAppChromeOsData(std::move(chromeos_data));
}
WebApp::SyncFallbackData sync_fallback_data; WebApp::SyncFallbackData sync_fallback_data;
sync_fallback_data.name = bookmark_app_registrar_->GetAppShortName(app_id); sync_fallback_data.name = bookmark_app_registrar_->GetAppShortName(app_id);
sync_fallback_data.theme_color = sync_fallback_data.theme_color =
......
...@@ -55,14 +55,6 @@ constexpr char kBaseDataDir[] = "chrome/test/data/banners"; ...@@ -55,14 +55,6 @@ constexpr char kBaseDataDir[] = "chrome/test/data/banners";
// manifest_test_page.html. // manifest_test_page.html.
constexpr char kSimpleManifestStartUrl[] = constexpr char kSimpleManifestStartUrl[] =
"https://example.org/manifest_test_page.html"; "https://example.org/manifest_test_page.html";
// start_url in release_notes_manifest.json generates the id of an app that
// should be hidden from the user.
constexpr char kHiddenAppInstallUrl[] =
"https://www.google.com/manifest_test_page.html"
"?manifest=release_notes_manifest.json";
constexpr char kHiddenAppStartUrl[] =
"https://www.google.com/chromebook/whatsnew/embedded/";
constexpr char kManifestWithShortcutsMenuInstallUrl[] = constexpr char kManifestWithShortcutsMenuInstallUrl[] =
"https://example.org/manifest_test_page.html" "https://example.org/manifest_test_page.html"
...@@ -258,41 +250,6 @@ IN_PROC_BROWSER_TEST_F(WebAppMigrationManagerBrowserTest, ...@@ -258,41 +250,6 @@ IN_PROC_BROWSER_TEST_F(WebAppMigrationManagerBrowserTest,
run_loop.Run(); run_loop.Run();
} }
IN_PROC_BROWSER_TEST_F(WebAppMigrationManagerBrowserTest,
PRE_DatabaseMigration_HiddenFromUser) {
ui_test_utils::NavigateToURL(browser(), GURL{kHiddenAppInstallUrl});
AppId app_id = InstallWebAppAsUserViaOmnibox();
EXPECT_EQ(GenerateAppIdFromURL(GURL(kHiddenAppStartUrl)), app_id);
EXPECT_TRUE(provider().registrar().AsBookmarkAppRegistrar());
EXPECT_FALSE(provider().registrar().AsWebAppRegistrar());
EXPECT_TRUE(provider().registrar().IsInstalled(app_id));
}
IN_PROC_BROWSER_TEST_F(WebAppMigrationManagerBrowserTest,
DatabaseMigration_HiddenFromUser) {
AwaitRegistryReady();
AppId app_id = GenerateAppIdFromURL(GURL{kHiddenAppStartUrl});
EXPECT_TRUE(provider().registrar().IsInstalled(app_id));
WebAppRegistrar* registrar = provider().registrar().AsWebAppRegistrar();
ASSERT_TRUE(registrar);
EXPECT_FALSE(provider().registrar().AsBookmarkAppRegistrar());
const WebApp* web_app = registrar->GetAppById(app_id);
ASSERT_TRUE(web_app);
if (IsChromeOs()) {
EXPECT_FALSE(web_app->chromeos_data()->show_in_launcher);
EXPECT_FALSE(web_app->chromeos_data()->show_in_search);
EXPECT_FALSE(web_app->chromeos_data()->show_in_management);
} else {
EXPECT_FALSE(web_app->chromeos_data().has_value());
}
}
IN_PROC_BROWSER_TEST_F(WebAppMigrationManagerBrowserTest, IN_PROC_BROWSER_TEST_F(WebAppMigrationManagerBrowserTest,
InstallShadowBookmarkApp) { InstallShadowBookmarkApp) {
EXPECT_FALSE(provider().registrar().AsBookmarkAppRegistrar()); EXPECT_FALSE(provider().registrar().AsBookmarkAppRegistrar());
......
...@@ -41,10 +41,6 @@ const char kChromeBetaForumURL[] = ...@@ -41,10 +41,6 @@ const char kChromeBetaForumURL[] =
const char kChromeFixUpdateProblems[] = const char kChromeFixUpdateProblems[] =
"https://support.google.com/chrome?p=fix_chrome_updates"; "https://support.google.com/chrome?p=fix_chrome_updates";
// TODO: replace w/link after marketing provides it.
const char kChromeReleaseNotesURL[] =
"https://www.google.com/chromebook/whatsnew/embedded/";
const char kChromeHelpViaKeyboardURL[] = const char kChromeHelpViaKeyboardURL[] =
#if BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING) #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
......
...@@ -60,9 +60,6 @@ extern const char kChromeBetaForumURL[]; ...@@ -60,9 +60,6 @@ extern const char kChromeBetaForumURL[];
// The URL for the help center article to fix Chrome update problems. // The URL for the help center article to fix Chrome update problems.
extern const char kChromeFixUpdateProblems[]; extern const char kChromeFixUpdateProblems[];
// Link to the release notes page managed by marketing.
extern const char kChromeReleaseNotesURL[];
// General help links for Chrome, opened using various actions. // General help links for Chrome, opened using various actions.
extern const char kChromeHelpViaKeyboardURL[]; extern const char kChromeHelpViaKeyboardURL[];
extern const char kChromeHelpViaMenuURL[]; extern const char kChromeHelpViaMenuURL[];
......
{
"name": "What's New",
"short_name": "What's New",
"icons": [
{
"src": "launcher-icon-1x.png",
"sizes": "48x48",
"type": "image/png"
},
{
"src": "launcher-icon-1-5x.png",
"sizes": "72x72",
"type": "image/png"
},
{
"src": "launcher-icon-2x.png",
"sizes": "96x96",
"type": "image/png",
"purpose": "any monochrome"
},
{
"src": "launcher-icon-3x.png",
"sizes": "144x144",
"type": "image/png"
},
{
"src": "launcher-icon-4x.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "image-512px.png",
"sizes": "512x512",
"type": "image/png"
}
],
"start_url": "https://www.google.com/chromebook/whatsnew/embedded/",
"scope": "/",
"display": "standalone",
"background_color": "#FFFFFF",
"theme_color": "#FFFFFF"
}
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