webapps: propogate name and shortName from manifest to Java

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

 // 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.
 
 package org.chromium.chrome.browser.webapps;
 
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ skipping 240 matching lines @@
 
             @Override
             public void onFaviconUpdated(Tab tab) {
                 if (!isWebappDomain()) return;
                 updateTaskDescription();
             }
         };
     }
 
     private void updateTaskDescription() {
-        String title = mWebappInfo.title() == null
-                ? getActivityTab().getTitle() : mWebappInfo.title();
+        String title = mWebappInfo.shortName() == null
+                ? getActivityTab().getTitle() : mWebappInfo.shortName();
         Bitmap icon = mWebappInfo.icon() == null
                 ? getActivityTab().getFavicon() : mWebappInfo.icon();
         int color = mBrandColor == null
                 ? getResources().getColor(R.color.default_primary_color) : mBrandColor;
 
         DocumentUtils.updateTaskDescription(this, title, icon, color, mBrandColor == null);
     }
 
     /**
      * Get the active directory by this web app.
@@ skipping 46 matching lines @@
     protected boolean isContextualSearchAllowed() {
         return false;
     }
 
     /**
      * Launches the URL in its own WebappActivity.
      * @param context Context to use for launching the webapp.
      * @param id ID of the webapp.
      * @param url URL for the webapp.
      * @param icon Base64 encoded Bitmap representing the webapp.
-     * @param title String to show in Recents.
+     * @param name String to show on the splash screen.
+     * @param shortName String to show on the recents menu
      * @param orientation Default orientation for the activity.
      */
     public static void launchInstance(Context context, String id, String url, String icon,
-            String title, int orientation, int source) {
+            String name, String shortName, int orientation, int source) {
         String activityName = WebappActivity.class.getName();
         if (!FeatureUtilities.isDocumentModeEligible(context)) {
             // Specifically assign the app to a particular WebappActivity instance.
             int activityIndex = ActivityAssigner.instance(context).assign(id);
             activityName += String.valueOf(activityIndex);
         }
 
         // Fire an intent to launch the Webapp in an unmapped Activity.
         Intent webappIntent = new Intent();
         webappIntent.setClassName(context, activityName);
         webappIntent.putExtra(ShortcutHelper.EXTRA_ICON, icon);
         webappIntent.putExtra(ShortcutHelper.EXTRA_ID, id);
         webappIntent.putExtra(ShortcutHelper.EXTRA_URL, url);
-        webappIntent.putExtra(ShortcutHelper.EXTRA_TITLE, title);
+        webappIntent.putExtra(ShortcutHelper.EXTRA_NAME, name);
+        webappIntent.putExtra(ShortcutHelper.EXTRA_SHORT_NAME, shortName);
         webappIntent.putExtra(ShortcutHelper.EXTRA_ORIENTATION, orientation);
         webappIntent.putExtra(ShortcutHelper.EXTRA_SOURCE, source);
 
         // On L, firing intents with the exact same data should relaunch a particular Activity.
         webappIntent.setAction(Intent.ACTION_VIEW);
         webappIntent.setData(Uri.parse(WEBAPP_SCHEME + "://" + id));
         webappIntent.setFlags(ApiCompatibilityUtils.getActivityNewDocumentFlag());
 
         context.startActivity(webappIntent);
     }
 }