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

Side by Side Diff: chrome/browser/android/banners/app_banner_manager_android.cc

Issue 2957063002: Update app banner state machine to use more states. (Closed)
Patch Set: Rebase Created 3 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/banners/app_banner_manager_android.h" 5 #include "chrome/browser/android/banners/app_banner_manager_android.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 JNIEnv* env = base::android::AttachCurrentThread(); 80 JNIEnv* env = base::android::AttachCurrentThread();
81 Java_AppBannerManager_destroy(env, java_banner_manager_); 81 Java_AppBannerManager_destroy(env, java_banner_manager_);
82 java_banner_manager_.Reset(); 82 java_banner_manager_.Reset();
83 } 83 }
84 84
85 const base::android::ScopedJavaGlobalRef<jobject>& 85 const base::android::ScopedJavaGlobalRef<jobject>&
86 AppBannerManagerAndroid::GetJavaBannerManager() const { 86 AppBannerManagerAndroid::GetJavaBannerManager() const {
87 return java_banner_manager_; 87 return java_banner_manager_;
88 } 88 }
89 89
90 bool AppBannerManagerAndroid::IsActiveForTesting( 90 bool AppBannerManagerAndroid::IsRunningForTesting(
91 JNIEnv* env, 91 JNIEnv* env,
92 const JavaParamRef<jobject>& obj) { 92 const JavaParamRef<jobject>& obj) {
93 return is_active(); 93 return IsRunning();
94 } 94 }
95 95
96 void AppBannerManagerAndroid::RecordMenuOpen(JNIEnv* env, 96 void AppBannerManagerAndroid::RecordMenuOpen(JNIEnv* env,
97 const JavaParamRef<jobject>& obj) { 97 const JavaParamRef<jobject>& obj) {
98 manager()->RecordMenuOpenHistogram(); 98 manager()->RecordMenuOpenHistogram();
99 } 99 }
100 100
101 void AppBannerManagerAndroid::RecordMenuItemAddToHomescreen( 101 void AppBannerManagerAndroid::RecordMenuItemAddToHomescreen(
102 JNIEnv* env, 102 JNIEnv* env,
103 const JavaParamRef<jobject>& obj) { 103 const JavaParamRef<jobject>& obj) {
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 badge_icon_url_ = data.badge_icon_url; 217 badge_icon_url_ = data.badge_icon_url;
218 badge_icon_ = *data.badge_icon; 218 badge_icon_ = *data.badge_icon;
219 } 219 }
220 220
221 AppBannerManager::OnDidPerformInstallableCheck(data); 221 AppBannerManager::OnDidPerformInstallableCheck(data);
222 } 222 }
223 223
224 void AppBannerManagerAndroid::OnAppIconFetched(const SkBitmap& bitmap) { 224 void AppBannerManagerAndroid::OnAppIconFetched(const SkBitmap& bitmap) {
225 if (bitmap.drawsNothing()) { 225 if (bitmap.drawsNothing()) {
226 ReportStatus(web_contents(), NO_ICON_AVAILABLE); 226 ReportStatus(web_contents(), NO_ICON_AVAILABLE);
227 Stop(); 227 Stop();
dominickn 2017/07/07 06:23:18 You need to add return here I think.
benwells 2017/07/07 06:29:27 Done.
228 } 228 }
229 229
230 if (!is_active())
231 return;
232
233 primary_icon_ = bitmap; 230 primary_icon_ = bitmap;
234 SendBannerPromptRequest(); 231 SendBannerPromptRequest();
235 } 232 }
236 233
237 void AppBannerManagerAndroid::ResetCurrentPageData() { 234 void AppBannerManagerAndroid::ResetCurrentPageData() {
238 AppBannerManager::ResetCurrentPageData(); 235 AppBannerManager::ResetCurrentPageData();
239 native_app_data_.Reset(); 236 native_app_data_.Reset();
240 native_app_package_ = ""; 237 native_app_package_ = "";
241 } 238 }
242 239
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 } 369 }
373 370
374 // static 371 // static
375 void SetTotalEngagementToTrigger(JNIEnv* env, 372 void SetTotalEngagementToTrigger(JNIEnv* env,
376 const JavaParamRef<jclass>& clazz, 373 const JavaParamRef<jclass>& clazz,
377 jdouble engagement) { 374 jdouble engagement) {
378 AppBannerSettingsHelper::SetTotalEngagementToTrigger(engagement); 375 AppBannerSettingsHelper::SetTotalEngagementToTrigger(engagement);
379 } 376 }
380 377
381 } // namespace banners 378 } // namespace banners
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698