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

Unified Diff: chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc

Issue 2244223002: Determine whether to show "Add to Homescreen" dialog or WebAPK infobar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into webapk_dialog_detector 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/webapps/add_to_homescreen_dialog_helper.cc
diff --git a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc b/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
deleted file mode 100644
index 465ec4c7f6cb5f07ab1a9758f20b8c083657c170..0000000000000000000000000000000000000000
--- a/chrome/browser/android/webapps/add_to_homescreen_dialog_helper.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-// 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 "chrome/browser/android/webapps/add_to_homescreen_dialog_helper.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_string.h"
-#include "base/guid.h"
-#include "base/location.h"
-#include "base/strings/string16.h"
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/android/shortcut_helper.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 "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) {
- 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);
-}
-
-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);
-}
-
-AddToHomescreenDialogHelper::~AddToHomescreenDialogHelper() {
- data_fetcher_->set_weak_observer(nullptr);
- data_fetcher_ = nullptr;
-}
-
-void AddToHomescreenDialogHelper::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_.obj(),
- j_user_title.obj());
-}
-
-void AddToHomescreenDialogHelper::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_.obj(),
- java_bitmap.obj());
-
- if (add_shortcut_pending_)
- AddShortcut(info, icon);
-}
-
-void AddToHomescreenDialogHelper::Destroy(JNIEnv* env,
- const JavaParamRef<jobject>& obj) {
- delete this;
-}
-
-SkBitmap AddToHomescreenDialogHelper::FinalizeLauncherIconInBackground(
- const SkBitmap& bitmap,
- const GURL& url,
- bool* is_generated) {
- DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
-
- return ShortcutHelper::FinalizeLauncherIconInBackground(bitmap, url,
- is_generated);
-}
-
-void AddToHomescreenDialogHelper::AddShortcut(
- JNIEnv* env,
- const JavaParamRef<jobject>& obj,
- const JavaParamRef<jstring>& j_user_title) {
- add_shortcut_pending_ = true;
-
- base::string16 user_title =
- base::android::ConvertJavaStringToUTF16(env, j_user_title);
- if (!user_title.empty())
- data_fetcher_->shortcut_info().user_title = user_title;
-
- if (data_fetcher_->is_ready()) {
- // If the fetcher isn't ready yet, the shortcut will be added when it is
- // via OnDataAvailable();
- AddShortcut(data_fetcher_->shortcut_info(), data_fetcher_->shortcut_icon());
- }
-}
-
-void AddToHomescreenDialogHelper::AddShortcut(const ShortcutInfo& info,
- const SkBitmap& icon) {
- DCHECK(add_shortcut_pending_);
- if (!add_shortcut_pending_)
- return;
- add_shortcut_pending_ = false;
-
- content::WebContents* web_contents = data_fetcher_->web_contents();
- if (!web_contents)
- return;
-
- RecordAddToHomescreen();
-
- const std::string& uid = base::GenerateGUID();
- ShortcutHelper::AddToLauncherWithSkBitmap(
- web_contents->GetBrowserContext(), info, uid, icon,
- data_fetcher_->FetchSplashScreenImageCallback(uid));
-}
-
-bool AddToHomescreenDialogHelper::RegisterAddToHomescreenDialogHelper(
- JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-void AddToHomescreenDialogHelper::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();
- if (!web_contents)
- return;
-
- AppBannerSettingsHelper::RecordBannerEvent(
- web_contents, web_contents->GetURL(),
- data_fetcher_->shortcut_info().url.spec(),
- AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
- base::Time::Now());
-}

Powered by Google App Engine
This is Rietveld 408576698