commit 15c0950d509e3d1f631edfe342ca27e50fce5fac
author Alan Cutter <alancutter@chromium.org> Tue Mar 26 06:47:29 2024
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 26 06:47:29 2024
tree a4f37db7832a4f8dc2eb1af27f3892261b57cc2c
parent 47a4670dd21fe2954a0129641abfa82c64c82dab

[AIS] Flatten nested ifs

This is a trivial clean up CL that flattens nested ifs in
AppInstallNavigationThrottle.
This also cleans up some stale TODOs.

Change-Id: Id2088a7137ce054a4e89082392ac34435bb9a594
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5392626
Commit-Queue: Alan Cutter <alancutter@chromium.org>
Reviewed-by: Tim Sergeant <tsergeant@chromium.org>
Auto-Submit: Alan Cutter <alancutter@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1278148}

chrome/browser/apps/app_service/app_install/app_install_navigation_throttle.cc

diff --git a/chrome/browser/apps/app_service/app_install/app_install_navigation_throttle.cc b/chrome/browser/apps/app_service/app_install/app_install_navigation_throttle.cc
index 4071f5c..a37b900f 100644
--- a/chrome/browser/apps/app_service/app_install/app_install_navigation_throttle.cc
+++ b/chrome/browser/apps/app_service/app_install/app_install_navigation_throttle.cc
@@ -125,39 +125,39 @@
   return HandleRequest();
 }
 
-// TODO(b/299825321): Make this require redirection from an Almanac server.
 ThrottleCheckResult AppInstallNavigationThrottle::WillRedirectRequest() {
   return HandleRequest();
 }
 
 ThrottleCheckResult AppInstallNavigationThrottle::HandleRequest() {
-  // TODO(b/304680258): Integration test this flow.
   const GURL& url = navigation_handle()->GetURL();
-  if (url.SchemeIs(chromeos::kAppInstallUriScheme) &&
-      url.path_piece() == kAppInstallPath) {
-    QueryParams query_params = ExtractQueryParams(url.query_piece());
-    // TODO(b/303350800): Generalize to work with all app types.
-    if (query_params.package_id.has_value() &&
-        (query_params.package_id->app_type() == AppType::kWeb ||
-         query_params.package_id->app_type() == AppType::kBorealis)) {
-      Profile* profile = Profile::FromBrowserContext(
-          navigation_handle()->GetWebContents()->GetBrowserContext());
-      auto* proxy = AppServiceProxyFactory::GetForProfile(profile);
-      proxy->AppInstallService().InstallApp(
-          query_params.source, std::move(query_params.package_id.value()),
-          base::DoNothing());
-    }
+  if (!url.SchemeIs(chromeos::kAppInstallUriScheme) ||
+      url.path_piece() != kAppInstallPath) {
+    return content::NavigationThrottle::PROCEED;
+  }
 
-    if (!chromeos::features::IsCrosWebAppInstallDialogEnabled() &&
-        LinkCapturingNavigationThrottle::
-            IsEmptyDanglingWebContentsAfterLinkCapture(navigation_handle())) {
-      navigation_handle()->GetWebContents()->Close();
-    }
-
+  QueryParams query_params = ExtractQueryParams(url.query_piece());
+  // TODO(b/303350800): Generalize to work with all app types.
+  if (!query_params.package_id.has_value() ||
+      (query_params.package_id->app_type() != AppType::kWeb &&
+       query_params.package_id->app_type() != AppType::kBorealis)) {
     return content::NavigationThrottle::CANCEL_AND_IGNORE;
   }
 
-  return content::NavigationThrottle::PROCEED;
+  Profile* profile = Profile::FromBrowserContext(
+      navigation_handle()->GetWebContents()->GetBrowserContext());
+  auto* proxy = AppServiceProxyFactory::GetForProfile(profile);
+  proxy->AppInstallService().InstallApp(
+      query_params.source, std::move(query_params.package_id.value()),
+      base::DoNothing());
+
+  if (!chromeos::features::IsCrosWebAppInstallDialogEnabled() &&
+      LinkCapturingNavigationThrottle::
+          IsEmptyDanglingWebContentsAfterLinkCapture(navigation_handle())) {
+    navigation_handle()->GetWebContents()->Close();
+  }
+
+  return content::NavigationThrottle::CANCEL_AND_IGNORE;
 }
 
 }  // namespace apps