[App banners] Break apart AppBannerManager and AppBannerInfoBarDelegate

chrome/browser/android/banners/app_banner_infobar_delegate.cc

Index: chrome/browser/android/banners/app_banner_infobar_delegate.cc
diff --git a/chrome/browser/android/banners/app_banner_infobar_delegate.cc b/chrome/browser/android/banners/app_banner_infobar_delegate.cc
index b32bfa315dbc5eb55a6f451129fa58fd771ec0d1..9869e36e32fe4fd6901a865e5914f86112637bfe 100644
--- a/chrome/browser/android/banners/app_banner_infobar_delegate.cc
+++ b/chrome/browser/android/banners/app_banner_infobar_delegate.cc
@@ -5,23 +5,46 @@
 #include "chrome/browser/android/banners/app_banner_infobar_delegate.h"
 
 #include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/threading/worker_pool.h"
+#include "chrome/browser/android/shortcut_helper.h"
+#include "chrome/browser/android/shortcut_info.h"
+#include "chrome/browser/android/tab_android.h"
+#include "chrome/browser/banners/app_banner_settings_helper.h"
+#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/android/infobars/app_banner_infobar.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_manager.h"
+#include "content/public/common/manifest.h"
+#include "jni/AppBannerInfoBarDelegate_jni.h"
+#include "ui/gfx/android/java_bitmap.h"
+
+using base::android::ConvertJavaStringToUTF8;
+using base::android::ConvertJavaStringToUTF16;
+using base::android::ConvertUTF8ToJavaString;
+using base::android::ConvertUTF16ToJavaString;
 
 namespace banners {
 
 // static
 AppBannerInfoBar* AppBannerInfoBarDelegate::CreateForNativeApp(
     infobars::InfoBarManager* infobar_manager,
-    AppDelegate* app_delegate,
-    const base::android::ScopedJavaGlobalRef<jobject>& japp_data) {
+    const base::string16& app_title,
+    SkBitmap* app_icon,
+    const base::android::ScopedJavaGlobalRef<jobject>& app_data,
+    const std::string& app_package) {
   scoped_ptr<AppBannerInfoBarDelegate> delegate(new AppBannerInfoBarDelegate(
-      app_delegate));
-  AppBannerInfoBar* infobar = new AppBannerInfoBar(delegate.Pass(), japp_data);
+      app_title,
+      app_icon,
+      content::Manifest(),
+      app_data,
+      app_package));
+  AppBannerInfoBar* infobar = new AppBannerInfoBar(delegate.Pass(),
+                                                   app_data);
   return infobar_manager->AddInfoBar(make_scoped_ptr(infobar))
       ? infobar : nullptr;
 }
@@ -29,27 +52,48 @@ AppBannerInfoBar* AppBannerInfoBarDelegate::CreateForNativeApp(
 // static
 AppBannerInfoBar* AppBannerInfoBarDelegate::CreateForWebApp(
     infobars::InfoBarManager* infobar_manager,
-    AppDelegate* app_delegate,
-    const GURL& url) {
+    const base::string16& app_title,
+    SkBitmap* app_icon,
+    const content::Manifest& web_app_data) {
   scoped_ptr<AppBannerInfoBarDelegate> delegate(new AppBannerInfoBarDelegate(
-      app_delegate));
-  AppBannerInfoBar* infobar = new AppBannerInfoBar(delegate.Pass(), url);
+      app_title,
+      app_icon,
+      web_app_data,
+      base::android::ScopedJavaGlobalRef<jobject>(),
+      std::string()));
+  AppBannerInfoBar* infobar = new AppBannerInfoBar(delegate.Pass(),
+                                                   web_app_data.start_url);
   return infobar_manager->AddInfoBar(make_scoped_ptr(infobar))
       ? infobar : nullptr;
 }
 
-AppBannerInfoBarDelegate::AppBannerInfoBarDelegate(AppDelegate* app_delegate)
-    : delegate_(app_delegate) {
+AppBannerInfoBarDelegate::AppBannerInfoBarDelegate(
+    const base::string16& app_title,
+    SkBitmap* app_icon,
+    const content::Manifest& web_app_data,
+    const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
+    const std::string& native_app_package)
+    : app_title_(app_title),
+      app_icon_(app_icon),
+      web_app_data_(web_app_data),
+      native_app_data_(native_app_data),
+      native_app_package_(native_app_package) {
+  DCHECK(native_app_data_.is_null() ^ web_app_data_.IsEmpty());
+  JNIEnv* env = base::android::AttachCurrentThread();
+  java_delegate_.Reset(Java_AppBannerInfoBarDelegate_create(
+      env,
+      reinterpret_cast<intptr_t>(this)));
 }
 
 AppBannerInfoBarDelegate::~AppBannerInfoBarDelegate() {
-  DCHECK(delegate_);
-  delegate_->OnInfoBarDestroyed();
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_AppBannerInfoBarDelegate_destroy(env,
+                                        java_delegate_.obj());
+  java_delegate_.Reset();
 }
 
 base::string16 AppBannerInfoBarDelegate::GetMessageText() const {
-  DCHECK(delegate_);
-  return delegate_->GetTitle();
+  return app_title_;
 }
 
 int AppBannerInfoBarDelegate::GetButtons() const {
@@ -57,23 +101,139 @@ int AppBannerInfoBarDelegate::GetButtons() const {
 }
 
 gfx::Image AppBannerInfoBarDelegate::GetIcon() const {
-  DCHECK(delegate_);
-  return delegate_->GetIcon();
+  return gfx::Image::CreateFrom1xBitmap(*app_icon_.get());
 }
 
 void AppBannerInfoBarDelegate::InfoBarDismissed() {
-  DCHECK(delegate_);
-  delegate_->Block();
+  content::WebContents* web_contents =
+      InfoBarService::WebContentsFromInfoBar(infobar());
+  if (!web_contents)
+    return;
+
+  if (!native_app_data_.is_null()) {
+    AppBannerSettingsHelper::RecordBannerEvent(
+        web_contents, web_contents->GetURL(),
+        native_app_package_,
+        AppBannerSettingsHelper::APP_BANNER_EVENT_DID_BLOCK, base::Time::Now());
+  } else if (!web_app_data_.IsEmpty()) {
+    AppBannerSettingsHelper::RecordBannerEvent(
+        web_contents, web_contents->GetURL(),
+        web_app_data_.start_url.spec(),
+        AppBannerSettingsHelper::APP_BANNER_EVENT_DID_BLOCK, base::Time::Now());
+  }
 }
 
 bool AppBannerInfoBarDelegate::Accept() {
-  DCHECK(delegate_);
-  return delegate_->OnButtonClicked();
+  content::WebContents* web_contents =
+      InfoBarService::WebContentsFromInfoBar(infobar());
+  if (!web_contents)
+    return true;
+
+  if (!native_app_data_.is_null()) {
+    JNIEnv* env = base::android::AttachCurrentThread();
+
+    TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
+    if (tab == nullptr) return true;

[Ted C, 2015/02/14 00:06:48]

goes on the next line

[gone, 2015/02/14 00:16:01]

Done.

+
+    return Java_AppBannerInfoBarDelegate_installOrOpenNativeApp(
+        env,
+        java_delegate_.obj(),
+        tab->GetJavaObject().obj(),
+        native_app_data_.obj());
+  } else if (!web_app_data_.IsEmpty()) {
+    AppBannerSettingsHelper::RecordBannerEvent(
+        web_contents, web_contents->GetURL(),
+        web_app_data_.start_url.spec(),
+        AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
+        base::Time::Now());
+
+    ShortcutInfo info;
+    info.UpdateFromManifest(web_app_data_);
+    base::WorkerPool::PostTask(
+        FROM_HERE,
+        base::Bind(&ShortcutHelper::AddShortcutInBackgroundWithSkBitmap,
+                   info,
+                   *app_icon_.get()),
+        true);
+    return true;
+  }
+
+  return true;
 }
 
 bool AppBannerInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
-  DCHECK(delegate_);
-  return delegate_->OnLinkClicked();
+  if (!native_app_data_.is_null()) {
+    // Try to show the details for the native app.
+    JNIEnv* env = base::android::AttachCurrentThread();
+
+    content::WebContents* web_contents =
+        InfoBarService::WebContentsFromInfoBar(infobar());
+    TabAndroid* tab = web_contents ? TabAndroid::FromWebContents(web_contents)
+                                   : nullptr;
+    if (tab == nullptr)
+      return true;
+
+    Java_AppBannerInfoBarDelegate_showAppDetails(env,
+                                                 java_delegate_.obj(),
+                                                 tab->GetJavaObject().obj(),
+                                                 native_app_data_.obj());
+    return true;
+  } else {
+    // Nothing should happen if the user is installing a web app.
+    return false;

[Ted C, 2015/02/14 00:06:48]

I would early exit on this conditional at the top and then reduce the indent of
the rest of the function.

[gone, 2015/02/14 00:16:01]

Done.

+  }
+}
+
+void AppBannerInfoBarDelegate::OnInstallIntentReturned(JNIEnv* env,
+                                               jobject obj,

[Ted C, 2015/02/14 00:06:48]

not aligned correctly

[gone, 2015/02/14 00:16:01]

Done.

+                                               jboolean jis_installing) {
+  if (!infobar())
+    return;
+
+  content::WebContents* web_contents =
+      InfoBarService::WebContentsFromInfoBar(infobar());
+  if (!web_contents)
+    return;
+
+  if (jis_installing) {
+    AppBannerSettingsHelper::RecordBannerEvent(
+        web_contents,
+        web_contents->GetURL(),
+        native_app_package_,
+        AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
+        base::Time::Now());
+  }
+
+  UpdateInstallState(env, obj);
+}
+
+void AppBannerInfoBarDelegate::OnInstallFinished(JNIEnv* env,
+                                         jobject obj,

[Ted C, 2015/02/14 00:06:48]

same here

[gone, 2015/02/14 00:16:01]

Done.

+                                         jboolean success) {
+  if (!infobar())
+    return;
+
+  if (success) {
+    UpdateInstallState(env, obj);
+  } else if (infobar()->owner()) {
+    infobar()->owner()->RemoveInfoBar(infobar());
+  }
+}
+
+void AppBannerInfoBarDelegate::UpdateInstallState(JNIEnv* env, jobject obj) {
+  if (native_app_data_.is_null())
+    return;
+
+  int newState = Java_AppBannerInfoBarDelegate_determineInstallState(
+      env,
+      java_delegate_.obj(),
+      native_app_data_.obj());
+  static_cast<AppBannerInfoBar*>(infobar())->OnInstallStateChanged(newState);
+}
+
+
+bool RegisterAppBannerInfoBarDelegate(JNIEnv* env) {
+ return RegisterNativesImpl(env);
 }
 
 }  // namespace banners