Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(729)

Unified Diff: chrome/browser/android/banners/app_banner_infobar_delegate_android.cc

Issue 2751423002: Remove unused open WebAPK logic in AppBannerInfoBarDelegateAndroid. (Closed)
Patch Set: Addressing comments Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 795a1b1cd0a5abea9c646ef4c6149ff501e22ae5..78bf13c3a2134614a0cabd48432e5e63b3bc2ce4 100644
--- a/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc
+++ b/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc
@@ -55,19 +55,13 @@ bool AppBannerInfoBarDelegateAndroid::Create(
int event_request_id,
webapk::InstallSource webapk_install_source) {
bool is_webapk = ChromeWebApkHost::CanInstallWebApk();
- std::string webapk_package_name = "";
- const GURL& url = shortcut_info->url;
- 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);
+ std::move(infobar_delegate), shortcut_info->url, is_webapk);
dominickn 2017/03/19 22:56:56 Oops, I gave you bad advice here. |shortcut_info|
F 2017/03/22 18:49:23 Thanks for finding the cause! Done :)
if (!InfoBarService::FromWebContents(web_contents)
->AddInfoBar(std::move(infobar)))
return false;
@@ -76,10 +70,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 +210,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 +218,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 +301,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;
}
@@ -417,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);
- else
- webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN_DISMISS);
+ webapk::TrackUserAction(webapk::USER_ACTION_INSTALLED_OPEN_DISMISS);
}
}
« no previous file with comments | « chrome/browser/android/banners/app_banner_infobar_delegate_android.h ('k') | chrome/browser/android/webapk/webapk_metrics.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698