webapps: propogate name and shortName from manifest to Java

chrome/browser/android/shortcut_info.cc

Index: chrome/browser/android/shortcut_info.cc
diff --git a/chrome/browser/android/shortcut_info.cc b/chrome/browser/android/shortcut_info.cc
index 67e0c5549c344667fdc39db4fc854bd8da65ea7d..8a36788403f7f8bc3e484780ebd78a89ecd689b1 100644
--- a/chrome/browser/android/shortcut_info.cc
+++ b/chrome/browser/android/shortcut_info.cc
@@ -18,10 +18,18 @@ ShortcutInfo::ShortcutInfo(const GURL& shortcut_url)
 }
 
 void ShortcutInfo::UpdateFromManifest(const content::Manifest& manifest) {
-  if (!manifest.short_name.is_null())
-    title = manifest.short_name.string();
-  else if (!manifest.name.is_null())
-    title = manifest.name.string();
+  if (manifest.name.is_null()) {
+    short_name = manifest.short_name.string();
+    name = short_name;
+  } else if (manifest.short_name.is_null()) {
+    name = manifest.name.string();
+    short_name = name;
+  } else {
+    name = manifest.name.string();
+    short_name = manifest.short_name.string();
+  }

[mlamouri (slow - plz ping), 2015/07/21 10:24:47]

I think this will explode if manifest.short_name and manifest.name are null.

What about:
if (!manifest.short_name.is_null())
  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())
    short_name = name;
  name = short_name;
}

[Lalit Maganti, 2015/07/21 10:26:44]

Ahhhhh I totally forgot this method gets called regardless of whether the
manifest is valid or not. Maybe we should change that? You're code looks good to
me :)

+  if (!short_name.empty())
+    user_title = short_name;
 
   // Set the url based on the manifest value, if any.
   if (manifest.start_url.is_valid())