From 459475e35e436d122d631bc86a493b856addb261 Mon Sep 17 00:00:00 2001 From: Evan Stade Date: Fri, 13 May 2022 23:14:54 +0000 Subject: [PATCH] M102 merge: File handling: remove settings controls from Chrome OS apps page This code might be causing crashes. (cherry picked from commit 184b91cb6f1b05b4bf072828d946fe28a7a74a01) (cherry picked from commit acc1a0cc679f553f04776fe3cbb94dbfbd06ee58) Bug: 1315958 Change-Id: I59686ec981bd57ec7b0b2437d80e459ecb156c51 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3621673 Reviewed-by: Nancy Wang Reviewed-by: Dominick Ng Commit-Queue: Evan Stade Cr-Original-Original-Commit-Position: refs/heads/main@{#998633} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3638090 Commit-Queue: Nancy Wang Reviewed-by: Jeevan Shikaram Cr-Original-Commit-Position: refs/branch-heads/4998@{#6} Cr-Original-Branched-From: 642353daff8fec60bddccf919e492491b84cd16f-refs/heads/main@{#990975} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3647090 Commit-Queue: Dominick Ng Auto-Submit: Nancy Wang Cr-Commit-Position: refs/branch-heads/5005@{#743} Cr-Branched-From: 5b4d9450fee01f821b6400e947b3839727643a71-refs/heads/main@{#992738} --- .../ui/webui/app_management/app_management_page_handler.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler.cc b/chrome/browser/ui/webui/app_management/app_management_page_handler.cc index 2bf79e3a4677b8..f4353aacf14920 100644 --- a/chrome/browser/ui/webui/app_management/app_management_page_handler.cc +++ b/chrome/browser/ui/webui/app_management/app_management_page_handler.cc @@ -67,8 +67,10 @@ const char* kAppIdsWithHiddenPinToShelf[] = { app_constants::kLacrosAppId, }; +#if !BUILDFLAG(IS_CHROMEOS) const char kFileHandlingLearnMore[] = "https://support.google.com/chrome/?p=pwa_default_associations"; +#endif #if BUILDFLAG(IS_CHROMEOS_ASH) constexpr char const* kAppIdsWithHiddenStoragePermission[] = { @@ -420,6 +422,8 @@ app_management::mojom::AppPtr AppManagementPageHandler::CreateUIAppPtr( std::move(run_on_os_login.value())); } +// Speculative fix for crbug.com/1315958 +#if !BUILDFLAG(IS_CHROMEOS) if (update.AppType() == apps::AppType::kWeb) { auto* provider = web_app::WebAppProvider::GetForLocalAppsUnchecked(profile_); @@ -461,6 +465,7 @@ app_management::mojom::AppPtr AppManagementPageHandler::CreateUIAppPtr( fh_enabled, /*is_managed=*/false, file_handling_types, file_handling_types_label, learn_more_url); } +#endif return app; }