Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Unified Diff: chrome/browser/android/webapk/webapk_update_manager.cc

Issue 2184913005: Add calls to the server to request WebAPK updates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WebAPK no longer owns a ManifestUpgradeDetector and rebase on "worker thread" CL. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/webapk/webapk_update_manager.cc
diff --git a/chrome/browser/android/webapk/webapk_update_manager.cc b/chrome/browser/android/webapk/webapk_update_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2bc2181234b420cb28bf67f04057214fa99a93b3
--- /dev/null
+++ b/chrome/browser/android/webapk/webapk_update_manager.cc
@@ -0,0 +1,98 @@
+// Copyright 2016 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/webapk/webapk_update_manager.h"
+
+#include <jni.h>
+
+#include "base/android/jni_string.h"
+#include "base/bind.h"
+#include "chrome/browser/android/webapk/webapk_installer.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/browser_thread.h"
+#include "jni/WebApkUpdateManager_jni.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/android/java_bitmap.h"
+#include "url/gurl.h"
+
+using base::android::JavaParamRef;
+
+// static
+bool WebApkUpdateManager::Register(JNIEnv* env) {
+ return RegisterNativesImpl(env);
+}
+
+// static
+void WebApkUpdateManager::OnBuiltWebApk(const std::string& webapk_package,
+ bool success) {
+ JNIEnv* env = base::android::AttachCurrentThread();
+
+ if (success) {
+ DVLOG(1)
+ << "Sent request to update WebAPK to server. Seems to have worked.";
+ } else {
+ LOG(WARNING) << "Server request to update WebAPK failed.";
+ }
+
+ base::android::ScopedJavaLocalRef<jstring> java_webapk_package =
+ base::android::ConvertUTF8ToJavaString(env, webapk_package);
+ Java_WebApkUpdateManager_onBuiltWebApk(env, success,
+ java_webapk_package.obj());
+}
+
+// static JNI method.
+static void UpdateAsync(JNIEnv* env,
+ const JavaParamRef<jclass>& clazz,
+ const JavaParamRef<jstring>& java_start_url,
+ const JavaParamRef<jstring>& java_scope,
+ const JavaParamRef<jstring>& java_name,
+ const JavaParamRef<jstring>& java_short_name,
+ const JavaParamRef<jstring>& java_icon_url,
+ const JavaParamRef<jobject>& java_icon_bitmap,
+ jint java_display_mode,
+ jint java_orientation,
+ jlong java_theme_color,
+ jlong java_background_color,
+ const JavaParamRef<jstring>& java_web_manifest_url,
+ const JavaParamRef<jstring>& java_webapk_package,
+ jint java_webapk_version) {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
pkotwicz 2016/08/11 22:02:45 Nit: I don't think that the DCHECK is useful (ever
Xi Han 2016/08/15 21:38:46 I would prefer to keep it since ProfileManager::Ge
+
+ GURL start_url(ConvertJavaStringToUTF8(env, java_start_url));
+ GURL scope(ConvertJavaStringToUTF8(env, java_scope));
+ GURL web_manifest_url(ConvertJavaStringToUTF8(env, java_web_manifest_url));
+ GURL icon_url(ConvertJavaStringToUTF8(env, java_icon_url));
+ ShortcutInfo info(start_url);
+ info.scope = scope;
+ info.name = ConvertJavaStringToUTF16(env, java_name);
+ info.short_name = ConvertJavaStringToUTF16(env, java_short_name);
+ info.display = static_cast<blink::WebDisplayMode>(java_display_mode);
+ info.orientation =
+ static_cast<blink::WebScreenOrientationLockType>(java_orientation);
+ info.theme_color = (long)java_theme_color;
+ info.background_color = (long)java_background_color;
+ info.icon_url = icon_url;
+ info.manifest_url = web_manifest_url;
+
+ gfx::JavaBitmap java_bitmap_lock(java_icon_bitmap);
+ SkBitmap icon_bitmap = gfx::CreateSkBitmapFromJavaBitmap(java_bitmap_lock);
+ icon_bitmap.setImmutable();
+
+ std::string webapk_package;
+ ConvertJavaStringToUTF8(env, java_webapk_package, &webapk_package);
+
+ Profile* profile = ProfileManager::GetLastUsedProfile();
+ if (profile == nullptr) {
Yaron 2016/08/12 21:16:17 nit: you should do early-outs (precontions) first
Xi Han 2016/08/15 21:38:45 Done.
+ NOTREACHED() << "Profile not found.";
+ return;
+ }
+
+ WebApkInstaller* installer = new WebApkInstaller(info, icon_bitmap);
+ installer->UpdateAsync(
+ static_cast<content::BrowserContext*>(profile),
pkotwicz 2016/08/11 22:02:45 Is the static_cast necessary?
Xi Han 2016/08/15 21:38:46 It seems it isn't anymore. I am sure it is needed
+ base::Bind(&WebApkUpdateManager::OnBuiltWebApk, webapk_package),
+ webapk_package, java_webapk_version);
+}

Powered by Google App Engine
This is Rietveld 408576698