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 2755e15d24f5591b3320cfc12529e6e52e386840..57b71d61d8845293ff1f7fec5c411c0b89159c02 100644 |
| --- a/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc |
| +++ b/chrome/browser/android/banners/app_banner_infobar_delegate_android.cc |
| @@ -35,14 +35,6 @@ using base::android::ConvertUTF16ToJavaString; |
| using base::android::JavaParamRef; |
| using base::android::ScopedJavaLocalRef; |
| -namespace { |
| - |
| -bool IsInfoEmpty(const std::unique_ptr<ShortcutInfo>& info) { |
| - return !info || info->url.is_empty(); |
| -} |
| - |
| -} // anonymous namespace |
| - |
| namespace banners { |
| // static |
| @@ -57,6 +49,9 @@ bool AppBannerInfoBarDelegateAndroid::Create( |
| bool is_webapk, |
| webapk::InstallSource webapk_install_source) { |
| const GURL url = shortcut_info->url; |
| + if (url.is_empty()) |
|
dominickn
2017/06/01 04:56:30
Nit: add DCHECK(shortcut_info) if we're going to a
pkotwicz
2017/06/01 05:11:28
This is unnecessary. Line 51 will crash if unique_
dominickn
2017/06/01 05:29:04
Yes, I know, but I prefer a DCHECK crash (which is
|
| + return false; |
| + |
| auto infobar_delegate = |
| base::WrapUnique(new banners::AppBannerInfoBarDelegateAndroid( |
| weak_manager, app_title, std::move(shortcut_info), primary_icon, |
| @@ -225,7 +220,6 @@ AppBannerInfoBarDelegateAndroid::AppBannerInfoBarDelegateAndroid( |
| install_state_(INSTALL_NOT_STARTED), |
| webapk_install_source_(webapk_install_source), |
| weak_ptr_factory_(this) { |
| - DCHECK(!IsInfoEmpty(shortcut_info_)); |
| CreateJavaDelegate(); |
| } |
| @@ -280,8 +274,6 @@ bool AppBannerInfoBarDelegateAndroid::AcceptNativeApp( |
| bool AppBannerInfoBarDelegateAndroid::AcceptWebApp( |
| content::WebContents* web_contents) { |
| - if (IsInfoEmpty(shortcut_info_)) |
| - return true; |
| TrackUserResponse(USER_RESPONSE_WEB_APP_ACCEPTED); |
| AppBannerSettingsHelper::RecordBannerInstallEvent( |
| @@ -296,9 +288,6 @@ bool AppBannerInfoBarDelegateAndroid::AcceptWebApp( |
| bool AppBannerInfoBarDelegateAndroid::AcceptWebApk( |
| content::WebContents* web_contents) { |
| - if (IsInfoEmpty(shortcut_info_)) |
| - return true; |
| - |
| JNIEnv* env = base::android::AttachCurrentThread(); |
| // If the WebAPK is installed and the "Open" button is clicked, open the |