webapps: propogate name and shortName from manifest to Java

chrome/browser/android/shortcut_data_fetcher.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_data_fetcher.h"
 
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
@@ skipping 47 matching lines @@
   is_waiting_for_web_application_info_ = false;
   if (!web_contents() || !weak_observer_) return;
 
   // Sanitize received_web_app_info.
   WebApplicationInfo web_app_info = received_web_app_info;
   web_app_info.title =
       web_app_info.title.substr(0, chrome::kMaxMetaTagAttributeLength);
   web_app_info.description =
       web_app_info.description.substr(0, chrome::kMaxMetaTagAttributeLength);
 
-  shortcut_info_.title = web_app_info.title.empty() ? web_contents()->GetTitle()
-                                                    : web_app_info.title;
+  // Simply set the user-editable title to be the page's title
+  shortcut_info_.user_title = web_app_info.title.empty()
+                                    ? web_contents()->GetTitle()
+                                    : web_app_info.title;
 
   if (web_app_info.mobile_capable == WebApplicationInfo::MOBILE_CAPABLE ||
       web_app_info.mobile_capable == WebApplicationInfo::MOBILE_CAPABLE_APPLE) {
     shortcut_info_.display = content::Manifest::DISPLAY_MODE_STANDALONE;
   }
 
   // Record what type of shortcut was added by the user.
   switch (web_app_info.mobile_capable) {
     case WebApplicationInfo::MOBILE_CAPABLE:
       content::RecordAction(
@@ skipping 34 matching lines @@
         false,
         preferred_icon_size_in_px_,
         false,
         base::Bind(&ShortcutDataFetcher::OnManifestIconFetched,
                    this));
   } else {
     // Grab the best favicon for the page.
     FetchFavicon();
   }
 
-  weak_observer_->OnTitleAvailable(shortcut_info_.title);
+  weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
 
   // Kick off a timeout for downloading the icon.  If an icon isn't set within
   // the timeout, fall back to using a dynamically-generated launcher icon.
   icon_timeout_timer_.Start(FROM_HERE,
                             base::TimeDelta::FromMilliseconds(3000),
                             base::Bind(&ShortcutDataFetcher::OnFaviconFetched,
                                        this,
                                        favicon_base::FaviconRawBitmapResult()));
 }
 
@@ skipping 111 matching lines @@
 void ShortcutDataFetcher::NotifyObserver(const SkBitmap& bitmap) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
   shortcut_icon_ = bitmap;
   is_ready_ = true;
   weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_);
 }