Start piping Android app promos through AppBannerInfoBars

chrome/browser/android/banners/app_banner_manager.cc

 // Copyright 2014 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/banners/app_banner_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 60 matching lines @@
   std::string package_name = ConvertJavaStringToUTF8(env, jpackage);
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents(), url, package_name,
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_BLOCK, base::Time::Now());
 }
 
 void AppBannerManager::Block() const {
   if (!web_contents())
     return;
 
-  if (!web_app_data_.IsEmpty()) {
+  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());
   }
 }
 
 void AppBannerManager::OnInfoBarDestroyed() {
   weak_infobar_ptr_ = nullptr;
 }
@@ skipping 33 matching lines @@
 }
 
 void AppBannerManager::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Clear current state.
   fetcher_.reset();
   app_title_ = base::string16();
   app_icon_.reset();
   web_app_data_ = content::Manifest();
+  native_app_data_.Reset();
+  native_app_package_ = std::string();
 }
 
 void AppBannerManager::DidFinishLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url) {
   if (render_frame_host->GetParent())
     return;
   validated_url_ = validated_url;
 
   // See if the page has a manifest. Using Unretained(this) here is safe as the
@@ skipping 95 matching lines @@
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> jobj = weak_java_banner_view_manager_.get(env);
   if (jobj.is_null())
     return;
 
   app_icon_.reset(new SkBitmap(*bitmap));
   InfoBarService* service = InfoBarService::FromWebContents(web_contents());
 
   weak_infobar_ptr_ = nullptr;
-  if (!web_app_data_.IsEmpty()){
+  if (!native_app_data_.is_null()) {
+    weak_infobar_ptr_ = AppBannerInfoBarDelegate::CreateForNativeApp(
+        service,
+        this,
+        native_app_data_);
+  } else if (!web_app_data_.IsEmpty()){
     weak_infobar_ptr_ = AppBannerInfoBarDelegate::CreateForWebApp(
         service,
         this,
         web_app_data_.start_url);
   }
 
   if (weak_infobar_ptr_ != nullptr)
     banners::TrackDisplayEvent(DISPLAY_CREATED);
 }
 
@@ skipping 17 matching lines @@
   // Send the info to the Java side to get info about the app.
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> jobj = weak_java_banner_view_manager_.get(env);
   if (jobj.is_null())
     return;
 
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, expected_url.spec()));
   ScopedJavaLocalRef<jstring> jpackage(
       ConvertUTF8ToJavaString(env, tag_content));
-  Java_AppBannerManager_prepareBanner(env,
-                                      jobj.obj(),
-                                      jurl.obj(),
-                                      jpackage.obj());
+  Java_AppBannerManager_fetchAppDetails(env,
+                                        jobj.obj(),
+                                        jurl.obj(),
+                                        jpackage.obj());
 }
 
-bool AppBannerManager::FetchIcon(JNIEnv* env,
-                                 jobject obj,
-                                 jstring jimage_url) {
-  std::string image_url = ConvertJavaStringToUTF8(env, jimage_url);
+bool AppBannerManager::OnAppDetailsRetrieved(JNIEnv* env,
+                                             jobject obj,
+                                             jobject japp_data,
+                                             jstring japp_title,
+                                             jstring japp_package,
+                                             jstring jicon_url) {
+  if (validated_url_ != web_contents()->GetURL())
+    return false;
+
+  std::string image_url = ConvertJavaStringToUTF8(env, jicon_url);
+  app_title_ = ConvertJavaStringToUTF16(env, japp_title);
+  native_app_package_ = ConvertJavaStringToUTF8(env, japp_package);
+  native_app_data_.Reset(env, japp_data);
   return FetchIcon(GURL(image_url));
 }
 
 bool AppBannerManager::FetchIcon(const GURL& image_url) {
   if (!web_contents())
     return false;
 
   // Begin asynchronously fetching the app icon.
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ skipping 47 matching lines @@
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableAppInstallAlerts);
 }
 
 // Register native methods
 bool RegisterAppBannerManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners