webapps: propogate name and shortName from manifest to Java

chrome/browser/android/shortcut_info.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/shortcut_info.h"
 
 ShortcutInfo::ShortcutInfo()
     : display(content::Manifest::DISPLAY_MODE_BROWSER),
       orientation(blink::WebScreenOrientationLockDefault),
       source(SOURCE_ADD_TO_HOMESCREEN) {
 }
 
 ShortcutInfo::ShortcutInfo(const GURL& shortcut_url)
     : url(shortcut_url),
       display(content::Manifest::DISPLAY_MODE_BROWSER),
       orientation(blink::WebScreenOrientationLockDefault),
       source(SOURCE_ADD_TO_HOMESCREEN) {
 }
 
 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())
     url = manifest.start_url;
 
   // Set the display based on the manifest value, if any.
   if (manifest.display != content::Manifest::DISPLAY_MODE_UNSPECIFIED)
     display = manifest.display;
 
   // 'fullscreen' and 'minimal-ui' are not yet supported, fallback to the right
   // mode in those cases.
   if (manifest.display == content::Manifest::DISPLAY_MODE_FULLSCREEN)
     display = content::Manifest::DISPLAY_MODE_STANDALONE;
   if (manifest.display == content::Manifest::DISPLAY_MODE_MINIMAL_UI)
     display = content::Manifest::DISPLAY_MODE_BROWSER;
 
   // Set the orientation based on the manifest value, if any.
   if (manifest.orientation != blink::WebScreenOrientationLockDefault) {
     // Ignore the orientation if the display mode is different from
     // 'standalone'.
     // TODO(mlamouri): send a message to the developer console about this.
     if (display == content::Manifest::DISPLAY_MODE_STANDALONE)
       orientation = manifest.orientation;
   }
 }
 
 void ShortcutInfo::UpdateSource(const Source new_source) {
   source = new_source;
 }