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

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

Issue 2671853002: Rename best icon to best primary icon in Web app related code. (Closed)
Patch Set: Removing java changes Created 3 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/android/shortcut_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9a267231d20d232448cfd80a440891805ddbe754..946ad02201971e514683a87facee3a0ccf7ac5aa 100644
--- a/chrome/browser/android/banners/app_banner_manager_android.cc
+++ b/chrome/browser/android/banners/app_banner_manager_android.cc
@@ -44,7 +44,7 @@ std::unique_ptr<ShortcutInfo> CreateShortcutInfo(
if (!manifest.IsEmpty()) {
shortcut_info->UpdateFromManifest(manifest);
shortcut_info->manifest_url = manifest_url;
- shortcut_info->best_icon_url = icon_url;
+ shortcut_info->best_primary_icon_url = icon_url;
shortcut_info->UpdateSource(ShortcutInfo::SOURCE_APP_BANNER);
}
return shortcut_info;
@@ -279,9 +279,9 @@ bool AppBannerManagerAndroid::CheckPlatformAndId(const std::string& platform,
const bool correct_platform = (platform == "play");
if (correct_platform && !id.empty())
return true;
- ReportStatus(web_contents(),
- correct_platform ? NO_ID_SPECIFIED
- : PLATFORM_NOT_SUPPORTED_ON_ANDROID);
+ ReportStatus(
+ web_contents(),
+ correct_platform ? NO_ID_SPECIFIED : PLATFORM_NOT_SUPPORTED_ON_ANDROID);
return false;
}
@@ -306,7 +306,6 @@ jint GetHomescreenLanguageOption(JNIEnv* env,
return AppBannerSettingsHelper::GetHomescreenLanguageOption();
}
-
// static
ScopedJavaLocalRef<jobject> GetJavaBannerManagerForWebContents(
JNIEnv* env,
@@ -314,8 +313,8 @@ ScopedJavaLocalRef<jobject> GetJavaBannerManagerForWebContents(
const JavaParamRef<jobject>& java_web_contents) {
AppBannerManagerAndroid* manager = AppBannerManagerAndroid::FromWebContents(
content::WebContents::FromJavaWebContents(java_web_contents));
- return manager? ScopedJavaLocalRef<jobject>(manager->GetJavaBannerManager())
- : ScopedJavaLocalRef<jobject>();
+ return manager ? ScopedJavaLocalRef<jobject>(manager->GetJavaBannerManager())
+ : ScopedJavaLocalRef<jobject>();
}
// static
« no previous file with comments | « no previous file | chrome/browser/android/shortcut_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698