Add WebappsClient::CanShowAppBanners

This removes a dependency on TabAndroid.

Bug: 1147268
Change-Id: Icbfa0ab7c0853b1935cf6bf9d9a52a4054302226
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2613535Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840861}

chrome/browser/banners/app_banner_manager_android.cc

@@ -14,8 +14,6 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/android/chrome_jni_headers/AppBannerManagerHelper_jni.h"
-#include "chrome/browser/android/tab_android.h"
-#include "chrome/browser/android/tab_web_contents_delegate_android.h"
 #include "chrome/browser/android/webapk/webapk_metrics.h"
 #include "chrome/browser/android/webapk/webapk_ukm_recorder.h"
 #include "chrome/browser/android/webapps/add_to_homescreen_coordinator.h"
@@ -68,14 +66,6 @@ constexpr char kIphReplacesToolbar[] = "x_iph_replaces_toolbar";
 // Whether to ignore the Chrome channel in QueryNativeApp() for testing.
 bool gIgnoreChromeChannelForTesting = false;
 
-bool CanShowAppBanners(TabAndroid* tab) {
-  if (!tab)
-    return false;
-  return static_cast<android::TabWebContentsDelegateAndroid*>(
-             tab->web_contents()->GetDelegate())
-      ->CanShowAppBanners();
-}
-
 }  // anonymous namespace
 
 AppBannerManagerAndroid::AppBannerManagerAndroid(
@@ -127,12 +117,10 @@ bool AppBannerManagerAndroid::OnAppDetailsRetrieved(
 
 void AppBannerManagerAndroid::RequestAppBanner(const GURL& validated_url) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  if (!Java_AppBannerManagerHelper_isEnabledForTab(env))
-    return;
-
-  TabAndroid* tab = TabAndroid::FromWebContents(web_contents());
-  if (!CanShowAppBanners(tab))
+  if (!Java_AppBannerManagerHelper_isEnabledForTab(env) ||
+      !WebappsClient::Get()->CanShowAppBanners(web_contents())) {
     return;
+  }
 
   AppBannerManager::RequestAppBanner(validated_url);
 }

chrome/browser/webapps/chrome_webapps_client.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/webapps/chrome_webapps_client.h"
 
 #include "base/logging.h"
-#include "build/build_config.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "components/webapps/installable/installable_metrics.h"
@@ -70,16 +69,21 @@ WebappInstallSource ChromeWebappsClient::GetInstallSource(
   return WebappInstallSource::COUNT;
 }
 
+#if defined(OS_ANDROID)
 bool ChromeWebappsClient::IsInstallationInProgress(
     content::WebContents* web_contents,
     const GURL& manifest_url) {
-#if defined(OS_ANDROID)
   return WebApkInstallService::Get(web_contents->GetBrowserContext())
       ->IsInstallInProgress(manifest_url);
-#else
-  NOTREACHED();
-  return false;
-#endif
 }
 
+bool ChromeWebappsClient::CanShowAppBanners(
+    content::WebContents* web_contents) {
+  TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
+  return tab && static_cast<android::TabWebContentsDelegateAndroid*>(
+                    tab->web_contents()->GetDelegate())
+                    ->CanShowAppBanners();
+}
+#endif
+
 }  // namespace webapps

chrome/browser/webapps/chrome_webapps_client.h

@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_WEBAPPS_CHROME_WEBAPPS_CLIENT_H_
 
 #include "base/no_destructor.h"
+#include "build/build_config.h"
 #include "components/webapps/webapps_client.h"
 
 namespace webapps {
@@ -24,8 +25,11 @@ class ChromeWebappsClient : public WebappsClient {
       content::WebContents* web_contents) override;
   WebappInstallSource GetInstallSource(content::WebContents* web_contents,
                                        InstallTrigger trigger) override;
+#if defined(OS_ANDROID)
   bool IsInstallationInProgress(content::WebContents* web_contents,
                                 const GURL& manifest_url) override;
+  bool CanShowAppBanners(content::WebContents* web_contents) override;
+#endif
 
  private:
   friend base::NoDestructor<ChromeWebappsClient>;

components/webapps/webapps_client.h

@@ -5,6 +5,7 @@
 #ifndef COMPONENTS_WEBAPPS_WEBAPPS_CLIENT_H_
 #define COMPONENTS_WEBAPPS_WEBAPPS_CLIENT_H_
 
+#include "build/build_config.h"
 #include "components/security_state/core/security_state.h"
 
 class GURL;
@@ -44,8 +45,12 @@ class WebappsClient {
       content::WebContents* web_contents,
       InstallTrigger trigger) = 0;
 
+#if defined(OS_ANDROID)
   virtual bool IsInstallationInProgress(content::WebContents* web_contents,
                                         const GURL& manifest_url) = 0;
+
+  virtual bool CanShowAppBanners(content::WebContents* web_contents) = 0;
+#endif
 };
 
 }  // namespace webapps