Initial CL for talking to the WebAPK server to generate WebAPK

chrome/browser/android/shortcut_helper.cc

 // Copyright 2013 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_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/android/webapk/webapk_builder.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ShortcutHelper_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/color_analysis.h"
 #include "url/gurl.h"
 
 using content::Manifest;
@@ skipping 28 matching lines @@
 
   // Try to ensure that the data returned is sane.
   DCHECK(kMinimumHomescreenIconSize <= kIdealHomescreenIconSize);
   DCHECK(kMinimumSplashImageSize <= kIdealSplashImageSize);
 }
 
 } // anonymous namespace
 
 // static
 void ShortcutHelper::AddShortcutInBackgroundWithSkBitmap(
+    content::BrowserContext* browser_context,
     const ShortcutInfo& info,
     const std::string& webapp_id,
     const SkBitmap& icon_bitmap,
     const base::Closure& splash_image_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   if (info.display == blink::WebDisplayModeStandalone ||
       info.display == blink::WebDisplayModeFullscreen) {
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableWebApk)) {
-      AddWebApkInBackgroundWithSkBitmap(info, webapp_id, icon_bitmap);
+      AddWebApkInBackgroundWithSkBitmap(browser_context, info, icon_bitmap);
       return;
     }
     AddWebappInBackgroundWithSkBitmap(info, webapp_id, icon_bitmap,
                                       splash_image_callback);
     return;
   }
   AddBookmarkShortcutInBackgroundWithSkBitmap(info, icon_bitmap);
 }
 
 // static
 void ShortcutHelper::AddWebApkInBackgroundWithSkBitmap(
+    content::BrowserContext* browser_context,
     const ShortcutInfo& info,
-    const std::string& webapp_id,
     const SkBitmap& icon_bitmap) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-
-  // TODO(pkotwicz): Send request to WebAPK server to generate WebAPK.
-
-  JNIEnv* env = base::android::AttachCurrentThread();
-  ScopedJavaLocalRef<jstring> java_url =
-      base::android::ConvertUTF8ToJavaString(env, info.url.spec());
-  ScopedJavaLocalRef<jstring> java_scope_url =
-      base::android::ConvertUTF8ToJavaString(env, info.scope.spec());
-  ScopedJavaLocalRef<jstring> java_name =
-      base::android::ConvertUTF16ToJavaString(env, info.name);
-  ScopedJavaLocalRef<jstring> java_short_name =
-      base::android::ConvertUTF16ToJavaString(env, info.short_name);
-  ScopedJavaLocalRef<jstring> java_icon_url =
-      base::android::ConvertUTF8ToJavaString(env, info.icon_url.spec());
-  ScopedJavaLocalRef<jobject> java_bitmap;
-  if (icon_bitmap.getSize())
-    java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
-  ScopedJavaLocalRef<jstring> java_manifest_url =
-      base::android::ConvertUTF8ToJavaString(env, info.manifest_url.spec());
-
-  Java_ShortcutHelper_installWebApk(
-      env,
-      java_url.obj(),
-      java_scope_url.obj(),
-      java_name.obj(),
-      java_short_name.obj(),
-      java_icon_url.obj(),
-      java_bitmap.obj(),
-      info.display,
-      info.orientation,
-      info.theme_color,
-      info.background_color,
-      java_manifest_url.obj());
+  WebApkBuilder* builder =
+      new WebApkBuilder(browser_context, info, icon_bitmap);

[Yaron, 2016/07/13 00:24:00]

brief comment on ownership please

[pkotwicz, 2016/07/13 02:15:30]

Done.

+  builder->BuildAsync(base::Bind(&ShortcutHelper::OnBuiltWebApk));
 }
 
 // static
 void ShortcutHelper::AddWebappInBackgroundWithSkBitmap(
     const ShortcutInfo& info,
     const std::string& webapp_id,
     const SkBitmap& icon_bitmap,
     const base::Closure& splash_image_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
@@ skipping 52 matching lines @@
       base::android::ConvertUTF16ToJavaString(env, info.user_title);
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
   Java_ShortcutHelper_addBookmarkShortcut(env, java_url.obj(),
                                           java_user_title.obj(),
                                           java_bitmap.obj(), info.source);
 }
 
+void ShortcutHelper::OnBuiltWebApk(bool success) {

[Yaron, 2016/07/13 00:24:01]

without any state on what was successful (ShortcutInfo is static) this will be
hard to deal with. Perhaps it should retain ownership of the ShortcutInfo?

[pkotwicz, 2016/07/13 02:15:30]

Yes ShortcutHelper::OnBuiltWebApk() should take more parameters once it has an
actual implementation.

I suspect that we will want to generate a non-WebAPK web app if the WebAPK
generation fails so we will need to pass all the parameters passed to
AddWebappInBackgroundWithSkBitmap() to OnBuiltWebApk()

We also need to figure out when the WebAPK will get registered with
WebappDataStorage so we will need to pass parameters in order to do that too

+  if (success) {
+    LOG(ERROR)
+        << "Sent request to create WebAPK to server. Seems to have worked.";
+  } else {
+    LOG(ERROR) << "Server request to create WebAPK failed.";
+  }
+  // TODO(pkotwicz): Figure out what to do when building WebAPK fails.
+  // (crbug.com/626950)
+}
+
 int ShortcutHelper::GetIdealHomescreenIconSizeInDp() {
   if (kIdealHomescreenIconSize == -1)
     GetHomescreenIconAndSplashImageSizes();
   return kIdealHomescreenIconSize;
 }
 
 int ShortcutHelper::GetMinimumHomescreenIconSizeInDp() {
   if (kMinimumHomescreenIconSize == -1)
     GetHomescreenIconAndSplashImageSizes();
   return kMinimumHomescreenIconSize;
@@ skipping 104 matching lines @@
   DCHECK(jsplash_image_callback);
   base::Closure* splash_image_callback =
       reinterpret_cast<base::Closure*>(jsplash_image_callback);
   splash_image_callback->Run();
   delete splash_image_callback;
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }