Make it clear that AddToHomescreenDataFetcher ignores WebApplicationInfo for WebAPK compatible pages

chrome/browser/android/webapps/add_to_homescreen_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/webapps/add_to_homescreen_data_fetcher.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 95 matching lines @@
 void AddToHomescreenDataFetcher::OnDidGetWebApplicationInfo(
     const WebApplicationInfo& received_web_app_info) {
   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);

[Xi Han, 2016/09/26 17:48:12]

Doesn't regular web app still need this?

[pkotwicz, 2016/09/26 20:13:47]

|web_app_info| is a variable which is local to the OnDidGetWebApplicationInfo()
function. I can't find where the description is used.

[Xi Han, 2016/09/26 20:15:41]

Acknowledged.

 
   // 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;
   shortcut_info_.short_name = shortcut_info_.user_title;
   shortcut_info_.name = shortcut_info_.user_title;
 
   if (web_app_info.mobile_capable == WebApplicationInfo::MOBILE_CAPABLE ||
       web_app_info.mobile_capable == WebApplicationInfo::MOBILE_CAPABLE_APPLE) {
@@ skipping 70 matching lines @@
     CreateLauncherIcon(SkBitmap());
 }
 
 void AddToHomescreenDataFetcher::OnDidPerformInstallableCheck(
     const InstallableData& data) {
   if (!web_contents() || !weak_observer_)
     return;
 
   is_installable_check_complete_ = true;
 
-  if (check_webapk_compatibility_)
-    weak_observer_->OnDidDetermineWebApkCompatibility(data.is_installable);
+  bool webapk_compatible = false;
+  if (check_webapk_compatibility_) {
+    webapk_compatible = data.is_installable;
+    weak_observer_->OnDidDetermineWebApkCompatibility(webapk_compatible);
+  }
+
+  // WebAPKs are wholly defined by the Web Manifest. Ignore the <meta> tag
+  // data received in OnDidGetWebApplicationInfo().
+  if (webapk_compatible) {
+    shortcut_info_ = ShortcutInfo(GURL());

[dominickn, 2016/09/27 01:51:28]

Nit: remove braces. Also, move this check into the preceding if statement?
webapk_compatible should never be true if check_webapk_compatibility_ is false.

+  }
 
   if (!data.manifest.IsEmpty()) {
     content::RecordAction(
         base::UserMetricsAction("webapps.AddShortcut.Manifest"));
     shortcut_info_.UpdateFromManifest(data.manifest);
     shortcut_info_.manifest_url = data.manifest_url;
   }
 
   // Save the splash screen URL for the later download.
   splash_screen_url_ = ManifestIconSelector::FindBestMatchingIcon(
@@ skipping 99 matching lines @@
 void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& icon) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
   shortcut_icon_ = icon;
   is_ready_ = true;
   weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_);
 }