Break out more manifest parsing logic from ShortcutHelper

chrome/browser/android/banners/app_banner_manager.cc

 // Copyright 2014 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/banners/app_banner_manager.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
+#include "base/threading/worker_pool.h"
 #include "chrome/browser/android/banners/app_banner_infobar_delegate.h"
 #include "chrome/browser/android/banners/app_banner_metrics_ids.h"
 #include "chrome/browser/android/banners/app_banner_utilities.h"
 #include "chrome/browser/android/manifest_icon_selector.h"
+#include "chrome/browser/android/shortcut_helper.h"
+#include "chrome/browser/android/shortcut_info.h"
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 44 matching lines @@
   AppBannerSettingsHelper::Block(web_contents(),
                                  web_contents()->GetURL(),
                                  manifest_.start_url.spec());
 }
 
 void AppBannerManager::Install() const {
   if (!web_contents())
     return;
 
   if (!manifest_.IsEmpty()) {
-    // TODO(dfalcantara): Trigger shortcut creation.
+    InstallManifestApp(manifest_, *app_icon_.get());
   }
 }
 
 gfx::Image AppBannerManager::GetIcon() const {
   return gfx::Image::CreateFrom1xBitmap(*app_icon_.get());
 }
 
 void AppBannerManager::ReplaceWebContents(JNIEnv* env,
                                           jobject obj,
                                           jobject jweb_contents) {
@@ skipping 29 matching lines @@
   // lifetime of this object extends beyond the lifetime of the web_contents(),
   // and when web_contents() is destroyed it will call OnDidGetManifest.
   web_contents()->GetManifest(base::Bind(&AppBannerManager::OnDidGetManifest,
                                          base::Unretained(this)));
 }
 
 void AppBannerManager::OnDidGetManifest(const content::Manifest& manifest) {
   if (web_contents()->IsBeingDestroyed())
     return;
 
-  if (manifest.IsEmpty()) {
-    // No manifest, see if there is a play store meta tag.
+  if (manifest.IsEmpty()
+      || !manifest.start_url.is_valid()
+      || (manifest.name.is_null() && manifest.short_name.is_null())) {
+    // No usable manifest, see if there is a play store meta tag.
     Send(new ChromeViewMsg_RetrieveMetaTagContent(routing_id(),
                                                   validated_url_,
                                                   kBannerTag));
     return;
   }
 
   // TODO(benwells): Check triggering parameters here and if there is a meta
   // tag.
 
   // Create an infobar to promote the manifest's app.
@@ skipping 117 matching lines @@
 
 int AppBannerManager::GetPreferredIconSize() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> jobj = weak_java_banner_view_manager_.get(env);
   if (jobj.is_null())
     return 0;
 
   return Java_AppBannerManager_getPreferredIconSize(env, jobj.obj());
 }
 
+// static
+void AppBannerManager::InstallManifestApp(const content::Manifest& manifest,
+                                          const SkBitmap& icon) {
+  ShortcutInfo info;
+  info.UpdateFromManifest(manifest);
+
+  base::WorkerPool::PostTask(
+      FROM_HERE,
+      base::Bind(&ShortcutHelper::AddShortcutInBackgroundWithSkBitmap,
+                 info,
+                 icon),
+      true);
+}
+
 void RecordDismissEvent(JNIEnv* env, jclass clazz, jint metric) {
   banners::TrackDismissEvent(metric);
 }
 
 void RecordInstallEvent(JNIEnv* env, jclass clazz, jint metric) {
   banners::TrackInstallEvent(metric);
 }
 
 jlong Init(JNIEnv* env, jobject obj) {
   AppBannerManager* manager = new AppBannerManager(env, obj);
   return reinterpret_cast<intptr_t>(manager);
 }
 
 jboolean IsEnabled(JNIEnv* env, jclass clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableAppInstallAlerts);
 }
 
 // Register native methods
 bool RegisterAppBannerManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace banners