Skip to content

Commit

Permalink
M102 merge: File handling: remove settings controls from Chrome OS ap…
Browse files Browse the repository at this point in the history
…ps page

This code might be causing crashes.

(cherry picked from commit 184b91c)

(cherry picked from commit acc1a0c)

Bug: 1315958
Change-Id: I59686ec981bd57ec7b0b2437d80e459ecb156c51
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3621673
Reviewed-by: Nancy Wang <nancylingwang@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Original-Original-Commit-Position: refs/heads/main@{#998633}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3638090
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Reviewed-by: Jeevan Shikaram <jshikaram@chromium.org>
Cr-Original-Commit-Position: refs/branch-heads/4998@{#6}
Cr-Original-Branched-From: 642353d-refs/heads/main@{#990975}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3647090
Commit-Queue: Dominick Ng <dominickn@chromium.org>
Auto-Submit: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#743}
Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
  • Loading branch information
Evan Stade authored and Chromium LUCI CQ committed May 13, 2022
1 parent c94a5a4 commit 459475e
Showing 1 changed file with 5 additions and 0 deletions.
Expand Up @@ -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[] = {
Expand Down Expand Up @@ -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_);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 459475e

Please sign in to comment.