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

Unified Diff: chrome/browser/android/shortcut_info.cc

Issue 2915913002: [WebAPKs] Display same text for menu & engagement banner (Closed)
Patch Set: Merge branch 'master' into same_infobar_title 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/shortcut_info.cc
diff --git a/chrome/browser/android/shortcut_info.cc b/chrome/browser/android/shortcut_info.cc
index 7811a601cb7a8f2c9a65c99b17b0d4303967fe1c..57f3ba7aa5fd5294740ae5b00e281dc40a1b6809 100644
--- a/chrome/browser/android/shortcut_info.cc
+++ b/chrome/browser/android/shortcut_info.cc
@@ -20,17 +20,15 @@ ShortcutInfo::~ShortcutInfo() {
}
void ShortcutInfo::UpdateFromManifest(const content::Manifest& manifest) {
- if (!manifest.short_name.is_null())
+ if (!manifest.short_name.string().empty() ||
+ !manifest.name.string().empty()) {
short_name = manifest.short_name.string();
- if (!manifest.name.is_null())
name = manifest.name.string();
- if (manifest.short_name.is_null() != manifest.name.is_null()) {
- if (manifest.short_name.is_null())
+ if (short_name.empty())
short_name = name;
- else
+ else if (name.empty())
name = short_name;
}
- user_title = short_name;
// Set the url based on the manifest value, if any.
if (manifest.start_url.is_valid())

Powered by Google App Engine
This is Rietveld 408576698