Fall back to shortcut A2HS when Phonesky is out of date or unavailable.

chrome/browser/android/webapps/add_to_homescreen_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/webapps/add_to_homescreen_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/guid.h"
 #include "base/location.h"
@@ skipping 24 matching lines @@
                          const JavaParamRef<jobject>& java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
   AddToHomescreenManager* manager = new AddToHomescreenManager(env, obj);
   manager->Start(web_contents);
   return reinterpret_cast<intptr_t>(manager);
 }
 
 AddToHomescreenManager::AddToHomescreenManager(JNIEnv* env, jobject obj)
     : add_shortcut_pending_(false),
-      is_webapk_compatible_(false) {
+      is_webapk_compatible_(false),
+      weak_ptr_factory_(this) {
   java_ref_.Reset(env, obj);
 }
 
 // static
 bool AddToHomescreenManager::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void AddToHomescreenManager::Destroy(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
@@ skipping 16 matching lines @@
     // via OnDataAvailable();
     AddShortcut(data_fetcher_->shortcut_info(), data_fetcher_->primary_icon());
   }
 }
 
 void AddToHomescreenManager::Start(content::WebContents* web_contents) {
   bool check_webapk_compatible = false;
   if (ChromeWebApkHost::AreWebApkEnabled() &&
       InstallableManager::IsContentSecure(web_contents)) {
     check_webapk_compatible = true;
-  } else {
+    if (ChromeWebApkHost::CanUseGooglePlayToInstallWebApk()) {
+      // It is possible that the Google Play Install API isn't available when
+      // Google Play install is enabled. In that case, we fallback to classic
+      // add-to-homescreen shortcut flow.
+      // ChromeWebApkHost will delete itself after the the check whether Google
+      // Play Install API is done.
+      ChromeWebApkHost* host = new ChromeWebApkHost();
+      ChromeWebApkHost::CanUseGooglePlayInstallApiCallback callback
+          = base::Bind(&AddToHomescreenManager::OnCanUseGooglePlayInstallApi,
+                      weak_ptr_factory_.GetWeakPtr(),

[pkotwicz, 2017/02/03 18:56:32]

Is a weak ptr needed? We currently leak AddToHomescreenManager. See
crbug.com/688444

[Xi Han, 2017/02/03 22:16:21]

Updated to Unretained(this).

+                      web_contents, check_webapk_compatible);
+      host->CanUseGooglePlayInstallApi(callback);
+      return;
+    }
+  }
+
+  StartImpl(web_contents, check_webapk_compatible, true);
+}
+
+void AddToHomescreenManager::StartImpl(content::WebContents* web_contents,
+                                       bool check_webapk_compatible,
+                                       bool can_use_webapk_install_flow) {
+  if (!check_webapk_compatible)
     ShowDialog();
-  }
 
   data_fetcher_ = new AddToHomescreenDataFetcher(
       web_contents, ShortcutHelper::GetIdealHomescreenIconSizeInPx(),
       ShortcutHelper::GetMinimumHomescreenIconSizeInPx(),
       ShortcutHelper::GetIdealSplashImageSizeInPx(),
       ShortcutHelper::GetMinimumSplashImageSizeInPx(),
       ShortcutHelper::GetIdealBadgeIconSizeInPx(),
-      check_webapk_compatible, this);
+      check_webapk_compatible, can_use_webapk_install_flow, this);
 }
 
 AddToHomescreenManager::~AddToHomescreenManager() {
   if (data_fetcher_) {
     data_fetcher_->set_weak_observer(nullptr);
     data_fetcher_ = nullptr;
   }
 }
 
+void AddToHomescreenManager::OnCanUseGooglePlayInstallApi(
+    content::WebContents* web_contents,
+    bool check_webapk_compatible,
+    bool isAvailable) {
+  StartImpl(web_contents, check_webapk_compatible, isAvailable);
+}
+
 void AddToHomescreenManager::ShowDialog() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_AddToHomescreenManager_showDialog(env, java_ref_);
 }
 
 void AddToHomescreenManager::AddShortcut(const ShortcutInfo& info,
                                          const SkBitmap& icon) {
   DCHECK(add_shortcut_pending_);
   if (!add_shortcut_pending_)
     return;
@@ skipping 47 matching lines @@
   ScopedJavaLocalRef<jstring> j_user_title =
       base::android::ConvertUTF16ToJavaString(env, user_title);
   Java_AddToHomescreenManager_onUserTitleAvailable(env,
                                                    java_ref_,
                                                    j_user_title);
 }
 
 void AddToHomescreenManager::OnDataAvailable(const ShortcutInfo& info,
                                              const SkBitmap& primary_icon,
                                              const SkBitmap& badge_icon) {
   if (is_webapk_compatible_) {

[pkotwicz, 2017/02/03 18:56:32]

My preference would be to call
ChromeWebApkHost::CanUseGooglePlayToInstallWebApk() from here

[Xi Han, 2017/02/03 22:16:21]

As discussed offline, we keep the call in the AddToHomescreeManager::Start() to
prevent adding more complicated logic in the manager and data fetcher.

     // TODO(zpeng): Add badge to WebAPK installation flow.
     WebApkInstallService* install_service =
         WebApkInstallService::Get(
             data_fetcher_->web_contents()->GetBrowserContext());
     if (install_service->IsInstallInProgress(info.manifest_url))
       ShortcutHelper::ShowWebApkInstallInProgressToast();
     else
       CreateInfoBarForWebApk(info, primary_icon);
     return;
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (!primary_icon.drawsNothing())
     java_bitmap = gfx::ConvertToJavaBitmap(&primary_icon);
 
   Java_AddToHomescreenManager_onReadyToAdd(env, java_ref_, java_bitmap);
 
   if (add_shortcut_pending_)
     AddShortcut(info, primary_icon);
 }
 
 void AddToHomescreenManager::CreateInfoBarForWebApk(const ShortcutInfo& info,
                                                     const SkBitmap& icon) {
   banners::AppBannerInfoBarDelegateAndroid::Create(
       data_fetcher_->web_contents(), nullptr, info.user_title,
       base::MakeUnique<ShortcutInfo>(info), base::MakeUnique<SkBitmap>(icon),
-      -1 /* event_request_id */, webapk::INSTALL_SOURCE_MENU);
+      -1 /* event_request_id */, true /* can_use_webapk_install_flow */,
+      webapk::INSTALL_SOURCE_MENU);
 }
 
 SkBitmap AddToHomescreenManager::FinalizeLauncherIconInBackground(
     const SkBitmap& bitmap,
     const GURL& url,
     bool* is_generated) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   return ShortcutHelper::FinalizeLauncherIconInBackground(bitmap, url,
                                                           is_generated);
 }