Index: chrome/browser/android/webapps/add_to_homescreen_manager.cc |
diff --git a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc b/chrome/browser/android/webapps/add_to_homescreen_manager.cc |
similarity index 53% |
copy from chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc |
copy to chrome/browser/android/webapps/add_to_homescreen_manager.cc |
index 555fc480f7adf892be1613fd938596591d868eb9..d7e5929cce20b287d60081bf160abd4bde2a3244 100644 |
--- a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc |
+++ b/chrome/browser/android/webapps/add_to_homescreen_manager.cc |
@@ -2,7 +2,7 @@ |
// 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_dialog_helper.h" |
+#include "chrome/browser/android/webapps/add_to_homescreen_manager.h" |
#include "base/android/jni_android.h" |
#include "base/android/jni_string.h" |
@@ -11,51 +11,43 @@ |
#include "base/strings/string16.h" |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/android/shortcut_helper.h" |
+#include "chrome/browser/android/webapk/chrome_webapk_host.h" |
#include "chrome/browser/banners/app_banner_settings_helper.h" |
#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/web_contents.h" |
-#include "jni/AddToHomescreenDialogHelper_jni.h" |
+#include "content/public/common/origin_util.h" |
+#include "jni/AddToHomescreenManager_jni.h" |
#include "ui/gfx/android/java_bitmap.h" |
using base::android::JavaParamRef; |
using base::android::ScopedJavaLocalRef; |
-jlong Initialize(JNIEnv* env, |
- const JavaParamRef<jobject>& obj, |
- const JavaParamRef<jobject>& java_web_contents) { |
+jlong InitializeAndStart(JNIEnv* env, |
+ const JavaParamRef<jobject>& obj, |
+ const JavaParamRef<jobject>& java_web_contents) { |
content::WebContents* web_contents = |
content::WebContents::FromJavaWebContents(java_web_contents); |
- AddToHomescreenDialogHelper* add_to_homescreen_helper = |
- new AddToHomescreenDialogHelper(env, obj, web_contents); |
- return reinterpret_cast<intptr_t>(add_to_homescreen_helper); |
+ AddToHomescreenManager* manager = new AddToHomescreenManager(env, obj); |
+ manager->Start(web_contents); |
+ return reinterpret_cast<intptr_t>(manager); |
} |
-// static |
-bool AddToHomescreenDialogHelper::RegisterAddToHomescreenDialogHelper( |
- JNIEnv* env) { |
- return RegisterNativesImpl(env); |
+AddToHomescreenManager::AddToHomescreenManager(JNIEnv* env, jobject obj) |
+ : add_shortcut_pending_(false) { |
+ java_ref_.Reset(env, obj); |
} |
-AddToHomescreenDialogHelper::AddToHomescreenDialogHelper( |
- JNIEnv* env, |
- jobject obj, |
- content::WebContents* web_contents) |
- : add_shortcut_pending_(false), |
- data_fetcher_(new AddToHomescreenDataFetcher(web_contents, |
- ShortcutHelper::GetIdealHomescreenIconSizeInDp(), |
- ShortcutHelper::GetMinimumHomescreenIconSizeInDp(), |
- ShortcutHelper::GetIdealSplashImageSizeInDp(), |
- ShortcutHelper::GetMinimumSplashImageSizeInDp(), |
- this)) { |
- java_ref_.Reset(env, obj); |
+// static |
+bool AddToHomescreenManager::Register(JNIEnv* env) { |
+ return RegisterNativesImpl(env); |
} |
-void AddToHomescreenDialogHelper::Destroy(JNIEnv* env, |
- const JavaParamRef<jobject>& obj) { |
+void AddToHomescreenManager::Destroy(JNIEnv* env, |
+ const JavaParamRef<jobject>& obj) { |
delete this; |
} |
-void AddToHomescreenDialogHelper::AddShortcut( |
+void AddToHomescreenManager::AddShortcut( |
JNIEnv* env, |
const JavaParamRef<jobject>& obj, |
const JavaParamRef<jstring>& j_user_title) { |
@@ -73,13 +65,37 @@ void AddToHomescreenDialogHelper::AddShortcut( |
} |
} |
-AddToHomescreenDialogHelper::~AddToHomescreenDialogHelper() { |
- data_fetcher_->set_weak_observer(nullptr); |
- data_fetcher_ = nullptr; |
+void AddToHomescreenManager::Start(content::WebContents* web_contents) { |
+ bool check_installable = false; |
+ if (ChromeWebApkHost::AreWebApkEnabled() && |
+ content::IsOriginSecure(web_contents->GetLastCommittedURL())) { |
+ check_installable = true; |
+ } else { |
+ ShowDialog(); |
+ } |
+ |
+ data_fetcher_ = new AddToHomescreenDataFetcher( |
+ web_contents, ShortcutHelper::GetIdealHomescreenIconSizeInDp(), |
+ ShortcutHelper::GetMinimumHomescreenIconSizeInDp(), |
+ ShortcutHelper::GetIdealSplashImageSizeInDp(), |
+ ShortcutHelper::GetMinimumSplashImageSizeInDp(), |
+ check_installable, this); |
} |
-void AddToHomescreenDialogHelper::AddShortcut(const ShortcutInfo& info, |
- const SkBitmap& icon) { |
+AddToHomescreenManager::~AddToHomescreenManager() { |
+ if (data_fetcher_) { |
+ data_fetcher_->set_weak_observer(nullptr); |
+ data_fetcher_ = nullptr; |
+ } |
+} |
+ |
+void AddToHomescreenManager::ShowDialog() { |
+ JNIEnv* env = base::android::AttachCurrentThread(); |
+ Java_AddToHomescreenManager_showDialog(env, java_ref_); |
+} |
+ |
+void AddToHomescreenManager::AddShortcut(const ShortcutInfo& info, |
+ const SkBitmap& icon) { |
DCHECK(add_shortcut_pending_); |
if (!add_shortcut_pending_) |
return; |
@@ -97,7 +113,7 @@ void AddToHomescreenDialogHelper::AddShortcut(const ShortcutInfo& info, |
data_fetcher_->FetchSplashScreenImageCallback(uid)); |
} |
-void AddToHomescreenDialogHelper::RecordAddToHomescreen() { |
+void AddToHomescreenManager::RecordAddToHomescreen() { |
// Record that the shortcut has been added, so no banners will be shown |
// for this app. |
content::WebContents* web_contents = data_fetcher_->web_contents(); |
@@ -111,29 +127,37 @@ void AddToHomescreenDialogHelper::RecordAddToHomescreen() { |
base::Time::Now()); |
} |
-void AddToHomescreenDialogHelper::OnUserTitleAvailable( |
+void AddToHomescreenManager::OnDidDetermineWebApkCompatibility( |
+ bool is_webapk_compatible) { |
+ // TODO(pkotwicz): Select whether to use dialog or not based on |
+ // |is_webapk_compatible|. |
+ ShowDialog(); |
+} |
+ |
+void AddToHomescreenManager::OnUserTitleAvailable( |
const base::string16& user_title) { |
JNIEnv* env = base::android::AttachCurrentThread(); |
ScopedJavaLocalRef<jstring> j_user_title = |
base::android::ConvertUTF16ToJavaString(env, user_title); |
- Java_AddToHomescreenDialogHelper_onUserTitleAvailable(env, java_ref_, |
- j_user_title); |
+ Java_AddToHomescreenManager_onUserTitleAvailable(env, |
+ java_ref_, |
+ j_user_title); |
} |
-void AddToHomescreenDialogHelper::OnDataAvailable(const ShortcutInfo& info, |
- const SkBitmap& icon) { |
+void AddToHomescreenManager::OnDataAvailable(const ShortcutInfo& info, |
+ const SkBitmap& icon) { |
JNIEnv* env = base::android::AttachCurrentThread(); |
ScopedJavaLocalRef<jobject> java_bitmap; |
if (icon.getSize()) |
java_bitmap = gfx::ConvertToJavaBitmap(&icon); |
- Java_AddToHomescreenDialogHelper_onIconAvailable(env, java_ref_, java_bitmap); |
+ Java_AddToHomescreenManager_onReadyToAdd(env, java_ref_, java_bitmap); |
if (add_shortcut_pending_) |
AddShortcut(info, icon); |
} |
-SkBitmap AddToHomescreenDialogHelper::FinalizeLauncherIconInBackground( |
+SkBitmap AddToHomescreenManager::FinalizeLauncherIconInBackground( |
const SkBitmap& bitmap, |
const GURL& url, |
bool* is_generated) { |