From 7cea78b8a6b295b28d460c9f545062b4b34b382b Mon Sep 17 00:00:00 2001 From: Zaina Al-Mashni Date: Fri, 27 Jan 2023 11:02:46 +0000 Subject: [PATCH] =?UTF-8?q?[About=20this=20site]=20Hide=20=E2=80=98About?= =?UTF-8?q?=20this=20page=E2=80=99=20header=20when=20improved=20bottomshee?= =?UTF-8?q?t=20feature=20flag=20is=20enabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add ‘ilrm=minimal,nohead’ to url when kPageInfoAboutThisSiteImprovedBottomSheet is enabled. Bug: 1358923 Change-Id: I7b4070ae4b525136d4bfaba7e2c231fc413f55af Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4194276 Reviewed-by: Ehimare Okoyomon Commit-Queue: Ehimare Okoyomon Cr-Commit-Position: refs/heads/main@{#1097848} --- .../PageInfoAboutThisSiteController.java | 7 +++++- .../page_info/PageInfoAboutThisSiteTest.java | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteController.java b/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteController.java index 0b8c60b079dbf0..d57aabc0c63327 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteController.java @@ -104,7 +104,12 @@ private void openUrl(String url, @PageInfoAction int action) { // Append parameter to open the page with reduced UI elements in the bottomsheet. Uri.Builder builder = Uri.parse(url).buildUpon(); if (mSiteInfo.hasMoreAbout() && url.equals(mSiteInfo.getMoreAbout().getUrl())) { - builder.appendQueryParameter("ilrm", "minimal,nohead"); + if (ChromeFeatureList.isEnabled( + ChromeFeatureList.PAGE_INFO_ABOUT_THIS_SITE_IMPROVED_BOTTOMSHEET)) { + builder.appendQueryParameter("ilrm", "minimal,nohead"); + } else { + builder.appendQueryParameter("ilrm", "minimal"); + } } GURL bottomSheetUrl = new GURL(builder.toString()); GURL fullPageUrl = new GURL(url); diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteTest.java index cae8aa938e8f12..7c7d8d2d320856 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/page_info/PageInfoAboutThisSiteTest.java @@ -45,6 +45,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeTabbedActivity; import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; +import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabObserver; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.tab.Tab; @@ -308,6 +309,28 @@ public void willAddTab(Tab tab, @TabLaunchType int type) { onView(withId(PageInfoAboutThisSiteController.ROW_ID)).perform(click()); String moreAboutUrl = mTestServerRule.getServer().getURL(sAboutHtml); + verify(mMockEphemeralTabCoordinator) + .requestOpenSheetWithFullPageUrl( + /*url=*/new GURL(moreAboutUrl + "?ilrm=minimal"), + /*fullPageUrl=*/new GURL(moreAboutUrl), /*title=*/"About this page", + /*isIncognito=*/false); + verify(mMockAboutThisSiteJni).onAboutThisSiteRowClicked(true); + } + + @Test + @MediumTest + @Features.EnableFeatures({ChromeFeatureList.PAGE_INFO_ABOUT_THIS_SITE_EN, + ChromeFeatureList.PAGE_INFO_ABOUT_THIS_SITE_NON_EN, + ChromeFeatureList.PAGE_INFO_ABOUT_THIS_SITE_MORE_INFO, + ChromeFeatureList.PAGE_INFO_ABOUT_THIS_SITE_IMPROVED_BOTTOMSHEET}) + public void + testAboutThisSiteOpensEphemeralTabWithImprovedBottomSheetEnabled() throws Exception { + mockResponse(createDescription()); + openPageInfo(); + + onView(withId(PageInfoAboutThisSiteController.ROW_ID)).perform(click()); + String moreAboutUrl = mTestServerRule.getServer().getURL(sAboutHtml); + verify(mMockEphemeralTabCoordinator).addObserver(any(EphemeralTabObserver.class)); // %2C is used to escape the comma in the url. verify(mMockEphemeralTabCoordinator) .requestOpenSheetWithFullPageUrl(