Follow up "Trigger app banner when add to homescreen is pressed and WebAPKs are enabled."

chrome/browser/android/banners/app_banner_manager_android.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 <utility>
 
 #include "chrome/browser/android/banners/app_banner_manager_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 16 matching lines @@
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(banners::AppBannerManagerAndroid);
 
 namespace {
 
-const char kReferrerName[] = "referrer";
-const char kIdName[] = "id";
-const char kPlayInlineReferrer[] = "playinline=chrome_inline";
-
 std::unique_ptr<ShortcutInfo> CreateShortcutInfo(
     const GURL& manifest_url,
     const content::Manifest& manifest,
     const GURL& icon_url) {
   auto shortcut_info = base::MakeUnique<ShortcutInfo>(GURL());
   if (!manifest.IsEmpty()) {
     shortcut_info->UpdateFromManifest(manifest);
     shortcut_info->manifest_url = manifest_url;
     shortcut_info->icon_url = icon_url;
     shortcut_info->UpdateSource(ShortcutInfo::SOURCE_APP_BANNER);
@@ skipping 178 matching lines @@
   if (!CheckPlatformAndId(platform, id))
     return false;
 
   banners::TrackDisplayEvent(DISPLAY_EVENT_NATIVE_APP_BANNER_REQUESTED);
 
   // Send the info to the Java side to get info about the app.
   JNIEnv* env = base::android::AttachCurrentThread();
   if (java_banner_manager_.is_null())
     return false;
 
-  std::string id_from_app_url = ExtractQueryValueForName(url, kIdName);
+  std::string id_from_app_url = ExtractQueryValueForName(url, "id");
   if (id_from_app_url.size() && id != id_from_app_url) {
     ReportStatus(web_contents(), IDS_DO_NOT_MATCH);
     return false;
   }
 
-  std::string referrer = ExtractQueryValueForName(url, kReferrerName);
+  std::string referrer = ExtractQueryValueForName(url, "referrer");
 
   // Attach the chrome_inline referrer value, prefixed with "&" if the referrer
   // is non empty.
+  const char kPlayInlineReferrer[] = "playinline=chrome_inline";
   if (referrer.empty())
     referrer = kPlayInlineReferrer;
   else
     referrer.append("&").append(kPlayInlineReferrer);

[Peter Kasting, 2016/09/09 21:50:45]

Nit: Slightly simpler:

  // Attach the chrome_inline referrer value.
  std::string referrer = ExtractQueryValueForName(url, "referrer");
  if (!referrer.empty())
    referrer += "&";
  const char kPlayInlineReferrer[] = "playinline=chrome_inline";
  referrer += kPlayInlineReferrer;

[Xi Han, 2016/09/12 13:49:51]

Done.

 
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, validated_url_.spec()));
   ScopedJavaLocalRef<jstring> jpackage(ConvertUTF8ToJavaString(env, id));
   ScopedJavaLocalRef<jstring> jreferrer(ConvertUTF8ToJavaString(env, referrer));
   Java_AppBannerManager_fetchAppDetails(env, java_banner_manager_, jurl,
                                         jpackage, jreferrer,
                                         GetIdealIconSizeInDp());
   return true;
 }
@@ skipping 57 matching lines @@
 }
 
 // static
 void SetTimeDeltaForTesting(JNIEnv* env,
                             const JavaParamRef<jclass>& clazz,
                             jint days) {
   AppBannerManager::SetTimeDeltaForTesting(days);
 }
 
 }  // namespace banners