Android: Fire the appinstalled event on WebAPK installation.

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/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
+#include "chrome/browser/android/banners/app_banner_manager_android.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/chrome_webapk_host.h"
 #include "chrome/browser/android/webapk/webapk_install_service.h"
 #include "chrome/browser/android/webapk/webapk_metrics.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/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/AddToHomescreenManager_jni.h"
@@ skipping 58 matching lines @@
     ShowDialog();
   }
 
   data_fetcher_ = new AddToHomescreenDataFetcher(
       web_contents, ShortcutHelper::GetIdealHomescreenIconSizeInPx(),
       ShortcutHelper::GetMinimumHomescreenIconSizeInPx(),
       ShortcutHelper::GetIdealSplashImageSizeInPx(),
       ShortcutHelper::GetMinimumSplashImageSizeInPx(),
       ShortcutHelper::GetIdealBadgeIconSizeInPx(),
       check_webapk_compatible, this);
+
+  app_banner_manager_ =

[dominickn, 2017/04/24 00:56:30]

Having thought about this, I think it's better to not have the instance variable
and just call ::FromWebContents at the two places in this file that need it
(both have a WebContents available). That means you don't need the forward
declaration in the header file and you can isolate the knowledge of the
AppBannerManager in this cc file. The two code paths are disjoint, and it means
we're not carrying around the extra instance pointer in the case where the user
taps add to homescreen but then cancels the process.

WDYT? If you want to keep the instance variable, move this to the start of the
method.

[Matt Giuca, 2017/04/24 01:42:13]

Done.

+      banners::AppBannerManagerAndroid::FromWebContents(web_contents);
+  DCHECK(app_banner_manager_);
 }
 
 AddToHomescreenManager::~AddToHomescreenManager() {
   if (data_fetcher_) {
     data_fetcher_->set_weak_observer(nullptr);
     data_fetcher_ = nullptr;
   }
 }
 
 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;
   add_shortcut_pending_ = false;
 
   content::WebContents* web_contents = data_fetcher_->web_contents();
   if (!web_contents)
     return;
 
   RecordAddToHomescreen();
   ShortcutHelper::AddToLauncherWithSkBitmap(web_contents, info, icon);
 
   // Fire the appinstalled event.
-  blink::mojom::InstallationServicePtr installation_service;
-  web_contents->GetMainFrame()->GetRemoteInterfaces()->GetInterface(
-      mojo::MakeRequest(&installation_service));
-  DCHECK(installation_service);
-  installation_service->OnInstall();
+  app_banner_manager_->OnInstall();
 }
 
 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();
   if (!web_contents)
     return;
 
   AppBannerSettingsHelper::RecordBannerEvent(
@@ skipping 48 matching lines @@
 
   if (add_shortcut_pending_)
     AddShortcut(info, primary_icon);
 }
 
 void AddToHomescreenManager::CreateInfoBarForWebApk(
     const ShortcutInfo& info,
     const SkBitmap& primary_icon,
     const SkBitmap& badge_icon) {
   banners::AppBannerInfoBarDelegateAndroid::Create(
-      data_fetcher_->web_contents(), nullptr, info.user_title,
-      base::MakeUnique<ShortcutInfo>(info), primary_icon, badge_icon,
-      -1 /* event_request_id */, webapk::INSTALL_SOURCE_MENU);
+      data_fetcher_->web_contents(), app_banner_manager_->GetWeakPtr(),
+      info.user_title, base::MakeUnique<ShortcutInfo>(info), primary_icon,
+      badge_icon, -1 /* event_request_id */, 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);
 }