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

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

Issue 2950113003: [Refactor] Remove AppBannerManager::app_title_ (Closed)
Patch Set: Merge branch 'master' into same_infobar_title0 Created 3 years, 6 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_manager_android.cc
diff --git a/chrome/browser/android/banners/app_banner_manager_android.cc b/chrome/browser/android/banners/app_banner_manager_android.cc
index cd8c740576e86460f94fe0f07c0edcce2effccb3..84126a3eba34e8cee270633232ec279efee77708 100644
--- a/chrome/browser/android/banners/app_banner_manager_android.cc
+++ b/chrome/browser/android/banners/app_banner_manager_android.cc
@@ -112,7 +112,7 @@ bool AppBannerManagerAndroid::OnAppDetailsRetrieved(
const JavaParamRef<jstring>& japp_package,
const JavaParamRef<jstring>& jicon_url) {
native_app_data_.Reset(japp_data);
- app_title_ = ConvertJavaStringToUTF16(env, japp_title);
+ native_app_title_ = ConvertJavaStringToUTF16(env, japp_title);
native_app_package_ = ConvertJavaStringToUTF8(env, japp_package);
primary_icon_url_ = GURL(ConvertJavaStringToUTF8(env, jicon_url));
@@ -245,11 +245,12 @@ void AppBannerManagerAndroid::ShowBanner() {
DCHECK(contents);
if (native_app_data_.is_null()) {
+ std::unique_ptr<ShortcutInfo> info =
+ CreateShortcutInfo(manifest_url_, manifest_, primary_icon_url_,
+ badge_icon_url_, can_install_webapk_);
if (AppBannerInfoBarDelegateAndroid::Create(
- contents, GetWeakPtr(), app_title_,
- CreateShortcutInfo(manifest_url_, manifest_, primary_icon_url_,
- badge_icon_url_, can_install_webapk_),
- primary_icon_, badge_icon_, event_request_id(), can_install_webapk_,
+ contents, GetWeakPtr(), info->name, std::move(info), primary_icon_,
+ badge_icon_, event_request_id(), can_install_webapk_,
webapk::INSTALL_SOURCE_BANNER)) {
RecordDidShowBanner("AppBanner.WebApp.Shown");
TrackDisplayEvent(DISPLAY_EVENT_WEB_APP_BANNER_CREATED);
@@ -259,7 +260,7 @@ void AppBannerManagerAndroid::ShowBanner() {
}
} else {
if (AppBannerInfoBarDelegateAndroid::Create(
- contents, app_title_, native_app_data_, primary_icon_,
+ contents, native_app_title_, native_app_data_, primary_icon_,
native_app_package_, referrer_, event_request_id())) {
RecordDidShowBanner("AppBanner.NativeApp.Shown");
TrackDisplayEvent(DISPLAY_EVENT_NATIVE_APP_BANNER_CREATED);
« no previous file with comments | « chrome/browser/android/banners/app_banner_manager_android.h ('k') | chrome/browser/banners/app_banner_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698