Determine whether to show "Add to Homescreen" dialog or WebAPK infobar

chrome/browser/android/webapps/add_to_homescreen_manager.cc

Index: chrome/browser/android/webapps/add_to_homescreen_manager.cc
diff --git a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc b/chrome/browser/android/webapps/add_to_homescreen_manager.cc
similarity index 43%
copy from chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
copy to chrome/browser/android/webapps/add_to_homescreen_manager.cc
index 555fc480f7adf892be1613fd938596591d868eb9..ba09a565efab1f64eda6267b95439ae14d5d377a 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
+++ b/chrome/browser/android/webapps/add_to_homescreen_manager.cc
@@ -2,7 +2,7 @@
 // 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_dialog_helper.h"
+#include "chrome/browser/android/webapps/add_to_homescreen_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ -11,51 +11,45 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/shortcut_helper.h"
+#include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
+#include "chrome/browser/installable/installable_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
-#include "jni/AddToHomescreenDialogHelper_jni.h"
+#include "content/public/common/origin_util.h"
+#include "jni/AddToHomescreenManager_jni.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
-jlong Initialize(JNIEnv* env,
-                 const JavaParamRef<jobject>& obj,
-                 const JavaParamRef<jobject>& java_web_contents) {
+jlong InitializeAndStart(JNIEnv* env,
+                         const JavaParamRef<jobject>& obj,
+                         const JavaParamRef<jobject>& java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
-  AddToHomescreenDialogHelper* add_to_homescreen_helper =
-      new AddToHomescreenDialogHelper(env, obj, web_contents);
-  return reinterpret_cast<intptr_t>(add_to_homescreen_helper);
+  AddToHomescreenManager* manager = new AddToHomescreenManager(env, obj);
+  manager->Start(web_contents);
+  return reinterpret_cast<intptr_t>(manager);
 }
 
-// static
-bool AddToHomescreenDialogHelper::RegisterAddToHomescreenDialogHelper(
-      JNIEnv* env) {
-  return RegisterNativesImpl(env);
+AddToHomescreenManager::AddToHomescreenManager(JNIEnv* env, jobject obj)
+    : add_shortcut_pending_(false), weak_ptr_factory_(this) {
+  java_ref_.Reset(env, obj);
 }
 
-AddToHomescreenDialogHelper::AddToHomescreenDialogHelper(
-    JNIEnv* env,
-    jobject obj,
-    content::WebContents* web_contents)
-    : add_shortcut_pending_(false),
-      data_fetcher_(new AddToHomescreenDataFetcher(web_contents,
-          ShortcutHelper::GetIdealHomescreenIconSizeInDp(),
-          ShortcutHelper::GetMinimumHomescreenIconSizeInDp(),
-          ShortcutHelper::GetIdealSplashImageSizeInDp(),
-          ShortcutHelper::GetMinimumSplashImageSizeInDp(),
-          this)) {
-  java_ref_.Reset(env, obj);
+// static
+bool AddToHomescreenManager::Register(JNIEnv* env) {
+  return RegisterNativesImpl(env);
 }
 
-void AddToHomescreenDialogHelper::Destroy(JNIEnv* env,
-                                          const JavaParamRef<jobject>& obj) {
+void AddToHomescreenManager::Destroy(JNIEnv* env,
+                                     const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
-void AddToHomescreenDialogHelper::AddShortcut(
+void AddToHomescreenManager::AddShortcut(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_user_title) {
@@ -73,13 +67,73 @@ void AddToHomescreenDialogHelper::AddShortcut(
   }
 }
 
-AddToHomescreenDialogHelper::~AddToHomescreenDialogHelper() {
-  data_fetcher_->set_weak_observer(nullptr);
-  data_fetcher_ = nullptr;
+void AddToHomescreenManager::Start(content::WebContents* web_contents) {
+  if (ChromeWebApkHost::AreWebApkEnabled()) {
+    CheckWebApkCompatible(web_contents);
+    return;
+  }
+  OnDeterminedWebApkCompatibility(web_contents, false);
+}
+
+AddToHomescreenManager::~AddToHomescreenManager() {
+  if (data_fetcher_) {
+    data_fetcher_->set_weak_observer(nullptr);
+    data_fetcher_ = nullptr;
+  }
+}
+
+void AddToHomescreenManager::CheckWebApkCompatible(
+    content::WebContents* web_contents) {
+  // A secure origin is required to create a WebAPK, so exit early if the origin
+  // is not secure.
+  if (!content::IsOriginSecure(web_contents->GetLastCommittedURL())) {
+    OnDeterminedWebApkCompatibility(web_contents, false);
+    return;
+  }
+
+  InstallableManager::CreateForWebContents(web_contents);
+  InstallableManager* installable_manager =
+      InstallableManager::FromWebContents(web_contents);
+  InstallableParams params;
+  params.check_installable = true;
+  params.fetch_valid_icon = false;
+  installable_manager->GetData(

[dominickn, 2016/08/29 00:13:37]

This really should be in the data fetcher, not in the manager, because the
fetcher is in charge of retrieving information. This class really shouldn't have
a weak pointer factory et al. Can you move this back to the fetcher and perhaps
add a OnDidDetermineWebApkCompatibility method to the observer interface?

+      params, base::Bind(&AddToHomescreenManager::OnGotWebApkCompatibilityData,
+                         weak_ptr_factory_.GetWeakPtr(), web_contents));
+}
+
+void AddToHomescreenManager::OnGotWebApkCompatibilityData(

[dominickn, 2016/08/29 00:13:37]

Nit: Please name this OnDidGetInstallableData (and similarly, everywhere with
"Got" should be "DidGet".

+    content::WebContents* web_contents,
+    const InstallableData& installable_data) {
+  OnDeterminedWebApkCompatibility(web_contents,
+                                  installable_data.is_installable);
+}
+
+void AddToHomescreenManager::OnDeterminedWebApkCompatibility(
+    content::WebContents* web_contents,
+    bool is_compatible) {
+  // TODO(pkotwicz): Select whether to use dialog or not based on
+  // |is_compatible|.
+  ShowDialog();
+  StartFetchingInfoForShortcut(web_contents);
+}
+
+void AddToHomescreenManager::ShowDialog() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_AddToHomescreenManager_showDialog(env, java_ref_);
+}
+
+void AddToHomescreenManager::StartFetchingInfoForShortcut(
+    content::WebContents* web_contents) {
+  data_fetcher_ = new AddToHomescreenDataFetcher(
+      web_contents, ShortcutHelper::GetIdealHomescreenIconSizeInDp(),
+      ShortcutHelper::GetMinimumHomescreenIconSizeInDp(),
+      ShortcutHelper::GetIdealSplashImageSizeInDp(),
+      ShortcutHelper::GetMinimumSplashImageSizeInDp(), this);
 }
 
-void AddToHomescreenDialogHelper::AddShortcut(const ShortcutInfo& info,
-                                              const SkBitmap& icon) {
+void AddToHomescreenManager::AddShortcut(const ShortcutInfo& info,
+                                         const SkBitmap& icon) {
   DCHECK(add_shortcut_pending_);
   if (!add_shortcut_pending_)
     return;
@@ -97,7 +151,7 @@ void AddToHomescreenDialogHelper::AddShortcut(const ShortcutInfo& info,
       data_fetcher_->FetchSplashScreenImageCallback(uid));
 }
 
-void AddToHomescreenDialogHelper::RecordAddToHomescreen() {
+void AddToHomescreenManager::RecordAddToHomescreen() {
   // Record that the shortcut has been added, so no banners will be shown
   // for this app.
   content::WebContents* web_contents = data_fetcher_->web_contents();
@@ -111,29 +165,30 @@ void AddToHomescreenDialogHelper::RecordAddToHomescreen() {
       base::Time::Now());
 }
 
-void AddToHomescreenDialogHelper::OnUserTitleAvailable(
+void AddToHomescreenManager::OnUserTitleAvailable(
     const base::string16& user_title) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_user_title =
       base::android::ConvertUTF16ToJavaString(env, user_title);
-  Java_AddToHomescreenDialogHelper_onUserTitleAvailable(env, java_ref_,
-                                                        j_user_title);
+  Java_AddToHomescreenManager_onUserTitleAvailable(env,
+                                                   java_ref_,
+                                                   j_user_title);
 }
 
-void AddToHomescreenDialogHelper::OnDataAvailable(const ShortcutInfo& info,
-                                                  const SkBitmap& icon) {
+void AddToHomescreenManager::OnDataAvailable(const ShortcutInfo& info,
+                                             const SkBitmap& icon) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon);
 
-  Java_AddToHomescreenDialogHelper_onIconAvailable(env, java_ref_, java_bitmap);
+  Java_AddToHomescreenManager_onReadyToAdd(env, java_ref_, java_bitmap);
 
   if (add_shortcut_pending_)
     AddShortcut(info, icon);
 }
 
-SkBitmap AddToHomescreenDialogHelper::FinalizeLauncherIconInBackground(
+SkBitmap AddToHomescreenManager::FinalizeLauncherIconInBackground(
     const SkBitmap& bitmap,
     const GURL& url,
     bool* is_generated) {