Log the source when installing a PWA on desktop.

Bug: 785661
Change-Id: Ibeef9470ce0224869e4d398115d211a123b82417
Reviewed-on: https://chromium-review.googlesource.com/804907
Commit-Queue: Michael McGreevy <mcgreevy@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Cr-Commit-Position: refs/heads/master@{#525265}

chrome/browser/android/webapk/webapk_metrics.cc

@@ -36,6 +36,8 @@ void TrackInstallSource(WebAppInstallSource event) {
       break;
     case WebAppInstallSource::MENU:
       source = InstallSource::INSTALL_SOURCE_MENU;
+    case WebAppInstallSource::MANAGEMENT_API:
+    // MANAGEMENT_API is not reported. Fallthrough to NOTREACHED().
     case WebAppInstallSource::COUNT:
       NOTREACHED();
       return;

chrome/browser/banners/app_banner_manager_desktop.cc

@@ -83,16 +83,14 @@ bool AppBannerManagerDesktop::IsWebAppConsideredInstalled(
 }
 
 void AppBannerManagerDesktop::ShowBannerUi(WebAppInstallSource install_source) {
-  // TODO(mcgreevy): log install_source to Webapp.Install.InstallSource
-  // histogram.
   content::WebContents* contents = web_contents();
   DCHECK(contents && !manifest_.IsEmpty());
 
   Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
   WebApplicationInfo web_app_info;
 
-  bookmark_app_helper_.reset(
-      new extensions::BookmarkAppHelper(profile, web_app_info, contents));
+  bookmark_app_helper_.reset(new extensions::BookmarkAppHelper(
+      profile, web_app_info, contents, install_source));
 
   if (IsExperimentalAppBannersEnabled()) {
     RecordDidShowBanner("AppBanner.WebApp.Shown");

chrome/browser/extensions/api/management/chrome_management_api_delegate.cc

@@ -149,7 +149,8 @@ class ChromeAppForLinkDelegate : public extensions::AppForLinkDelegate {
     }
 
     bookmark_app_helper_.reset(new extensions::BookmarkAppHelper(
-        Profile::FromBrowserContext(context), web_app, NULL));
+        Profile::FromBrowserContext(context), web_app, nullptr,
+        WebAppInstallSource::MANAGEMENT_API));
     bookmark_app_helper_->Create(
         base::Bind(&extensions::ManagementGenerateAppForLinkFunction::
                        FinishCreateBookmarkApp,

chrome/browser/extensions/bookmark_app_helper.cc

@@ -531,12 +531,14 @@ BookmarkAppHelper::BitmapAndSource::~BitmapAndSource() {
 
 BookmarkAppHelper::BookmarkAppHelper(Profile* profile,
                                      WebApplicationInfo web_app_info,
-                                     content::WebContents* contents)
+                                     content::WebContents* contents,
+                                     WebAppInstallSource install_source)
     : profile_(profile),
       contents_(contents),
       web_app_info_(web_app_info),
       crx_installer_(extensions::CrxInstaller::CreateSilent(
           ExtensionSystem::Get(profile)->extension_service())),
+      install_source_(install_source),
       weak_factory_(this) {
   if (contents)
     installable_manager_ = InstallableManager::FromWebContents(contents);
@@ -729,6 +731,11 @@ void BookmarkAppHelper::OnBubbleCompleted(
   if (user_accepted) {
     web_app_info_ = web_app_info;
     crx_installer_->InstallWebApp(web_app_info_);
+
+    if (InstallableMetrics::IsReportableInstallSource(install_source_) &&
+        installable_ == INSTALLABLE_YES) {
+      InstallableMetrics::TrackInstallSource(install_source_);
+    }
   } else {
     callback_.Run(nullptr, web_app_info_);
   }

chrome/browser/extensions/bookmark_app_helper.h

@@ -13,6 +13,7 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/common/web_application_info.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -55,9 +56,11 @@ class BookmarkAppHelper : public content::NotificationObserver {
   // All existing icons from WebApplicationInfo will also be used. The user
   // will then be prompted to edit the creation information via a bubble and
   // will have a chance to cancel the operation.
+  // |install_source| indicates how the installation was triggered.
   BookmarkAppHelper(Profile* profile,
                     WebApplicationInfo web_app_info,
-                    content::WebContents* contents);
+                    content::WebContents* contents,
+                    WebAppInstallSource install_source);
   ~BookmarkAppHelper() override;
 
   // Update the given WebApplicationInfo with information from the manifest.
@@ -165,6 +168,9 @@ class BookmarkAppHelper : public content::NotificationObserver {
 
   Installable installable_ = INSTALLABLE_UNKNOWN;
 
+  // The mechanism via which the app creation was triggered.
+  WebAppInstallSource install_source_;
+
   // With fast tab unloading enabled, shutting down can cause BookmarkAppHelper
   // to be destroyed before the bookmark creation bubble. Use weak pointers to
   // prevent a heap-use-after free in this instance (https://crbug.com/534994).

chrome/browser/extensions/bookmark_app_helper_browsertest.cc

@@ -31,8 +31,9 @@ class TestBookmarkAppHelper : public BookmarkAppHelper {
   TestBookmarkAppHelper(Profile* profile,
                         WebApplicationInfo web_app_info,
                         content::WebContents* contents,
-                        base::Closure on_icons_downloaded_closure)
-      : BookmarkAppHelper(profile, web_app_info, contents),
+                        base::Closure on_icons_downloaded_closure,
+                        WebAppInstallSource install_source)
+      : BookmarkAppHelper(profile, web_app_info, contents, install_source),
         on_icons_downloaded_closure_(on_icons_downloaded_closure) {}
 
   // TestBookmarkAppHelper:
@@ -73,7 +74,8 @@ class BookmarkAppHelperTest : public DialogBrowserTest {
       info.title = base::UTF8ToUTF16(info.app_url.spec());
 
     bookmark_app_helper_ = base::MakeUnique<TestBookmarkAppHelper>(
-        browser()->profile(), info, web_contents(), quit_closure_);
+        browser()->profile(), info, web_contents(), quit_closure_,
+        WebAppInstallSource::MENU);
     bookmark_app_helper_->Create(
         base::Bind(&BookmarkAppHelperTest::FinishCreateBookmarkApp,
                    base::Unretained(this)));

chrome/browser/extensions/bookmark_app_helper_unittest.cc

@@ -283,7 +283,10 @@ class TestBookmarkAppHelper : public BookmarkAppHelper {
   TestBookmarkAppHelper(ExtensionService* service,
                         WebApplicationInfo web_app_info,
                         content::WebContents* contents)
-      : BookmarkAppHelper(service->profile(), web_app_info, contents),
+      : BookmarkAppHelper(service->profile(),
+                          web_app_info,
+                          contents,
+                          WebAppInstallSource::MENU),
         bitmap_(CreateSquareBitmapWithColor(32, SK_ColorRED)) {}
 
   ~TestBookmarkAppHelper() override {}

chrome/browser/extensions/tab_helper.cc

@@ -24,6 +24,7 @@
 #include "chrome/browser/extensions/install_tracker_factory.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/extensions/webstore_inline_installer_factory.h"
+#include "chrome/browser/installable/installable_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/shell_integration.h"
@@ -365,8 +366,8 @@ void TabHelper::OnDidGetWebApplicationInfo(
       if (web_app_info_.title.empty())
         web_app_info_.title = base::UTF8ToUTF16(web_app_info_.app_url.spec());
 
-      bookmark_app_helper_.reset(
-          new BookmarkAppHelper(profile_, web_app_info_, web_contents()));
+      bookmark_app_helper_.reset(new BookmarkAppHelper(
+          profile_, web_app_info_, web_contents(), WebAppInstallSource::MENU));
       bookmark_app_helper_->Create(base::Bind(
           &TabHelper::FinishCreateBookmarkApp, weak_ptr_factory_.GetWeakPtr()));
       break;

chrome/browser/installable/installable_metrics.cc

@@ -9,10 +9,18 @@
 
 // static
 void InstallableMetrics::TrackInstallSource(WebAppInstallSource source) {
+  DCHECK(IsReportableInstallSource(source));
   UMA_HISTOGRAM_ENUMERATION("Webapp.Install.InstallSource", source,
                             WebAppInstallSource::COUNT);
 }
 
+// static
+bool InstallableMetrics::IsReportableInstallSource(WebAppInstallSource source) {
+  return source == WebAppInstallSource::AUTOMATIC_PROMPT ||
+         source == WebAppInstallSource::MENU ||
+         source == WebAppInstallSource::API;
+}
+
 namespace {
 
 void WriteMenuOpenHistogram(InstallabilityCheckStatus status, int count) {

chrome/browser/installable/installable_metrics.h

@@ -32,11 +32,14 @@ enum class AddToHomescreenTimeoutStatus {
 };
 
 // The ways that an app install can be triggered.
+// NOTE: each enum entry which is reportable must be added to
+// InstallableMetrics::IsReportableInstallSource().
 // This enum backs a UMA histogram and must be treated as append-only.
 enum class WebAppInstallSource {
   AUTOMATIC_PROMPT = 0,  // Automatic prompt e.g. install banner.
   MENU = 1,              // Chrome menu
   API = 2,               // BeforeInstallPrompt.prompt().
+  MANAGEMENT_API = 3,    // Extensions management API (not reported).
   COUNT,
 };
 
@@ -59,8 +62,14 @@ class InstallableMetrics {
   InstallableMetrics();
   ~InstallableMetrics();
 
+  // Records |source| in the Webapp.Install.InstallSource histogram.
+  // IsReportableInstallSource(|source|) must be true.
   static void TrackInstallSource(WebAppInstallSource source);
 
+  // Returns whether |source| is a value that may be passed to
+  // TrackInstallSource.
+  static bool IsReportableInstallSource(WebAppInstallSource source);
+
   // This records the state of the installability check when the Android menu is
   // opened.
   void RecordMenuOpen();

tools/metrics/histograms/enums.xml

@@ -43928,6 +43928,7 @@ Called by update_traffic_annotation_histograms.py.-->
   <int value="0" label="Installed via the automatically-triggered prompt"/>
   <int value="1" label="Installed via the menu"/>
   <int value="2" label="Installed via a developer-triggered API call"/>
+  <int value="3" label="Installed via the management API (not reported)"/>
 </enum>
 
 <enum name="WebAudioAutoplayStatus">