Pass WebAPK install source to AppBannerInfobarDelegateAndroid constructor.

chrome/browser/android/banners/app_banner_infobar_delegate_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_
 
 #include "base/android/scoped_java_ref.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
+#include "chrome/browser/android/webapk/webapk_metrics.h"
 #include "chrome/browser/banners/app_banner_manager.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace infobars {
@@ skipping 11 matching lines @@
   // Creates an infobar and delegate for promoting the installation of a web
   // app, and adds the infobar to the InfoBarManager for |web_contents|.
   static bool Create(
       content::WebContents* web_contents,
       base::WeakPtr<AppBannerManager> weak_manager,
       const base::string16& app_title,
       std::unique_ptr<ShortcutInfo> info,
       std::unique_ptr<SkBitmap> icon,
       int event_request_id,
       bool is_webapk,
-      bool start_install_webapk);
+      webapk::InstallSource install_source);
 
   // Creates and shows the infobar for an Android app.
   // Creates an infobar and delegate for promoting the installation of an
   // Android app, and adds the infobar to the InfoBarManager for |web_contents|.
   static bool Create(
       content::WebContents* web_contents,
       const base::string16& app_title,
       const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
       std::unique_ptr<SkBitmap> icon,
       const std::string& native_app_package,
@@ skipping 10 matching lines @@
   // returned to Chrome.
   void OnInstallIntentReturned(JNIEnv* env,
                                const base::android::JavaParamRef<jobject>& obj,
                                jboolean jis_installing);
 
   // Called when the InstallerDelegate task has finished.
   void OnInstallFinished(JNIEnv* env,
                          const base::android::JavaParamRef<jobject>& obj,
                          jboolean success);
 
-  // When user accepts to install a WebAPK, this function sends a request
-  // to the WebAPK Server to create a WebAPK and install it. It returns
-  // false to prevent infobar from disappearing when installation starts.
-  // When user clicks the Open button after the intallation is compelete, this
-  // function launches the installed WebAPK and returns true.
-  bool AcceptWebApk(content::WebContents* web_contents);
+  // ConfirmInfoBarDelegate:
+  bool Accept() override;
 
  private:
   // The states of a WebAPK installation, where the infobar is displayed during
   // the entire installation process. This state is used to correctly record
   // UMA metrics.
   enum InstallState {
     INSTALL_NOT_STARTED,
     INSTALLING,
     INSTALLED,
   };
 
   // Delegate for promoting a web app.
   AppBannerInfoBarDelegateAndroid(
       base::WeakPtr<AppBannerManager> weak_manager,
       const base::string16& app_title,
       std::unique_ptr<ShortcutInfo> info,
       std::unique_ptr<SkBitmap> icon,
       int event_request_id,
-      bool is_webapk);
+      bool is_webapk,
+      webapk::InstallSource install_source);
 
   // Delegate for promoting an Android app.
   AppBannerInfoBarDelegateAndroid(
       const base::string16& app_title,
       const base::android::ScopedJavaGlobalRef<jobject>& native_app_data,
       std::unique_ptr<SkBitmap> icon,
       const std::string& native_app_package,
       const std::string& referrer,
       int event_request_id);
 
   void CreateJavaDelegate();
   bool AcceptNativeApp(content::WebContents* web_contents);
   bool AcceptWebApp(content::WebContents* web_contents);
+
+  // When user accepts to install a WebAPK, this function sends a request
+  // to the WebAPK Server to create a WebAPK and install it. It returns
+  // false to prevent infobar from disappearing when installation starts.
+  // When user clicks the Open button after the intallation is compelete, this
+  // function launches the installed WebAPK and returns true.
+  bool AcceptWebApk(content::WebContents* web_contents);

[pkotwicz, 2016/09/26 20:23:10]

Nit: New line

Whenever I add a function which has a comment, I always add a new line before
the comment and after the function

[Xi Han, 2016/09/26 20:33:31]

Done.

   void SendBannerAccepted(content::WebContents* web_contents,
                           const std::string& platform);
   void OnWebApkInstallFinished(bool success, const std::string& webapk_package);
   void TrackWebApkInstallationDismissEvents(InstallState install_state);
 
   // ConfirmInfoBarDelegate:
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
   gfx::Image GetIcon() const override;
   void InfoBarDismissed() override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
-  bool Accept() override;
   bool LinkClicked(WindowOpenDisposition disposition) override;
 
   base::android::ScopedJavaGlobalRef<jobject> java_delegate_;
 
   // Used to fetch the splash screen icon for webapps.
   base::WeakPtr<AppBannerManager> weak_manager_;
 
   base::string16 app_title_;
   std::unique_ptr<ShortcutInfo> shortcut_info_;
 
   base::android::ScopedJavaGlobalRef<jobject> native_app_data_;
 
   std::unique_ptr<SkBitmap> icon_;
 
   std::string native_app_package_;
   std::string referrer_;
   int event_request_id_;
   bool has_user_interaction_;
 
   std::string webapk_package_name_;
   bool is_webapk_;
 
   // Indicates the current state of a WebAPK installation.
   InstallState install_state_;
 
+  // Indicates the way in which a WebAPK (if applicable) is installed: from the
+  // menu or from an app banner.
+  webapk::InstallSource install_source_;

[pkotwicz, 2016/09/26 20:23:10]

Nit: |install_source_| -> |webapk_install_source_|

[Xi Han, 2016/09/26 20:33:31]

Done.

+
   base::WeakPtrFactory<AppBannerInfoBarDelegateAndroid> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppBannerInfoBarDelegateAndroid);
 };
 
 // Register native methods.
 bool RegisterAppBannerInfoBarDelegateAndroid(JNIEnv* env);
 
 }  // namespace banners
 
 #endif  // CHROME_BROWSER_ANDROID_BANNERS_APP_BANNER_INFOBAR_DELEGATE_ANDROID_H_