Fix NTP view counter on Android (#31168)

Changed RegisterPageView() to be called after
GetCurrentWallpaperForDisplay()
This commit is contained in:
Aleksei Seren
2025-09-13 01:11:31 +09:00
committed by GitHub
parent 367cba64bf
commit 87ba6f1985
4 changed files with 12 additions and 42 deletions
@@ -88,11 +88,6 @@ public class NTPBackgroundImagesBridge {
}
}
public void registerPageView() {
NTPBackgroundImagesBridgeJni.get().registerPageView(
mNativeNTPBackgroundImagesBridge, NTPBackgroundImagesBridge.this);
}
public void wallpaperLogoClicked(Wallpaper wallpaper) {
NTPBackgroundImagesBridgeJni.get()
.wallpaperLogoClicked(
@@ -191,9 +186,6 @@ public class NTPBackgroundImagesBridge {
NTPImage getCurrentWallpaper(
long nativeNTPBackgroundImagesBridge, NTPBackgroundImagesBridge caller);
void registerPageView(
long nativeNTPBackgroundImagesBridge, NTPBackgroundImagesBridge caller);
void wallpaperLogoClicked(
long nativeNTPBackgroundImagesBridge,
NTPBackgroundImagesBridge caller,
@@ -16,7 +16,6 @@ import org.chromium.chrome.browser.ChromeTabbedActivity;
import org.chromium.chrome.browser.app.BraveActivity;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
import org.chromium.chrome.browser.multiwindow.MultiInstanceManager;
import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge;
import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil;
import org.chromium.chrome.browser.preferences.BravePref;
import org.chromium.chrome.browser.profiles.ProfileManager;
@@ -26,7 +25,6 @@ import org.chromium.chrome.browser.tab.TabDelegateFactory;
import org.chromium.chrome.browser.tab.TabLaunchType;
import org.chromium.components.embedder_support.util.UrlConstants;
import org.chromium.components.user_prefs.UserPrefs;
import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.ui.base.WindowAndroid;
public class BraveTabCreator extends ChromeTabCreator {
@@ -55,9 +53,9 @@ public class BraveTabCreator extends ChromeTabCreator {
@Override
public Tab launchUrl(String url, @TabLaunchType int type) {
if (url.equals(UrlConstants.NTP_URL)
&& (type == TabLaunchType.FROM_CHROME_UI || type == TabLaunchType.FROM_STARTUP
&& (type == TabLaunchType.FROM_CHROME_UI
|| type == TabLaunchType.FROM_STARTUP
|| type == TabLaunchType.FROM_TAB_SWITCHER_UI)) {
registerPageView();
ChromeTabbedActivity chromeTabbedActivity = BraveActivity.getChromeTabbedActivity();
if (chromeTabbedActivity != null && Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
TabModel tabModel = chromeTabbedActivity.getCurrentTabModel();
@@ -82,18 +80,4 @@ public class BraveTabCreator extends ChromeTabCreator {
}
return super.launchUrl(url, type);
}
@Override
public Tab createNewTab(LoadUrlParams loadUrlParams, @TabLaunchType int type, Tab parent) {
if (loadUrlParams.getUrl().equals(UrlConstants.NTP_URL)
&& type == TabLaunchType.FROM_TAB_GROUP_UI) {
registerPageView();
}
return super.createNewTab(loadUrlParams, type, parent, null);
}
private void registerPageView() {
NTPBackgroundImagesBridge.getInstance(ProfileManager.getLastUsedRegularProfile())
.registerPageView();
}
}