Chromium Code Reviews| Index: chrome/browser/android/banners/app_banner_infobar_delegate_android.cc |
| diff --git a/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc b/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc |
| index 04146414bc3dec3c6f1026d2b8645027a752762e..59bc3a989d00816eb6e938a82882776138f94a78 100644 |
| --- a/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc |
| +++ b/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc |
| @@ -57,14 +57,10 @@ bool AppBannerInfoBarDelegateAndroid::Create( |
| bool is_webapk = ChromeWebApkHost::CanInstallWebApk(); |
| std::string webapk_package_name = ""; |
|
dominickn
2017/03/16 23:42:04
This variable isn't used anymore, remove.
F
2017/03/17 15:26:53
Done.
|
| const GURL& url = shortcut_info->url; |
|
dominickn
2017/03/16 23:42:04
Remove this variable and just pass shortcut_info->
F
2017/03/17 15:26:53
Done.
|
| - if (is_webapk) |
| - webapk_package_name = ShortcutHelper::QueryWebApkPackage(url); |
| - bool is_webapk_already_installed = !webapk_package_name.empty(); |
| auto infobar_delegate = |
| base::WrapUnique(new banners::AppBannerInfoBarDelegateAndroid( |
| weak_manager, app_title, std::move(shortcut_info), std::move(icon), |
| - event_request_id, is_webapk, is_webapk_already_installed, |
| - webapk_install_source)); |
| + event_request_id, is_webapk, webapk_install_source)); |
| auto* raw_delegate = infobar_delegate.get(); |
| auto infobar = base::MakeUnique<AppBannerInfoBarAndroid>( |
| std::move(infobar_delegate), url, is_webapk); |
| @@ -76,10 +72,7 @@ bool AppBannerInfoBarDelegateAndroid::Create( |
| if (webapk_install_source == webapk::INSTALL_SOURCE_MENU) { |
| webapk::TrackInstallInfoBarShown( |
| webapk::WEBAPK_INFOBAR_SHOWN_FROM_MENU); |
| - if (is_webapk_already_installed) |
| - raw_delegate->UpdateStateForInstalledWebAPK(webapk_package_name); |
| - else |
| - raw_delegate->Accept(); |
| + raw_delegate->Accept(); |
| } else { |
| webapk::TrackInstallInfoBarShown( |
| webapk::WEBAPK_INFOBAR_SHOWN_FROM_BANNER); |
| @@ -219,7 +212,6 @@ AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid( |
| std::unique_ptr<SkBitmap> icon, |
| int event_request_id, |
| bool is_webapk, |
| - bool is_webapk_already_installed, |
| webapk::InstallSource webapk_install_source) |
| : weak_manager_(weak_manager), |
| app_title_(app_title), |
| @@ -228,7 +220,6 @@ AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid( |
| event_request_id_(event_request_id), |
| has_user_interaction_(false), |
| is_webapk_(is_webapk), |
| - is_webapk_already_installed_(is_webapk_already_installed), |
| install_state_(INSTALL_NOT_STARTED), |
| webapk_install_source_(webapk_install_source), |
| weak_ptr_factory_(this) { |
| @@ -312,10 +303,7 @@ bool AppBannerInfoBarDelegateAndroid::AcceptWebApk( |
| // WebAPK. |
| if (install_state_ == INSTALLED) { |
| Java_AppBannerInfoBarDelegateAndroid_openWebApk(env, java_delegate_); |
| - if (is_webapk_already_installed_) |
| - webapk::TrackUserAction(webapk::USER_ACTION_OPEN); |
| - else |
| - webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN); |
| + webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN); |
| SendBannerAccepted(); |
| return true; |
| } |
| @@ -415,10 +403,7 @@ void AppBannerInfoBarDelegateAndroid::TrackWebApkInstallationDismissEvents( |
| } else if (install_state == INSTALLED) { |
| // If WebAPK is installed from this banner, TrackInstallEvent() is called in |
| // OnWebApkInstallFinished(). |
| - if (is_webapk_already_installed_) |
| - webapk::TrackUserAction(webapk::USER_ACTION_OPEN_DISMISS); |
|
dominickn
2017/03/16 23:42:04
OPEN_DISMISS and OPEN are no longer triggered by a
F
2017/03/17 15:26:53
Done.
|
| - else |
| - webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN_DISMISS); |
| + webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN_DISMISS); |
| } |
| } |