Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 1398295c authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Patches for v143 (final version)

parent b1cdb676

build/patches/Add-an-always-incognito-mode.patch

+2 −32
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 .../browser/tabmodel/ChromeTabCreator.java    |   5 +-

 .../tabmodel/TabModelSelectorImpl.java        |   3 +

 .../tabmodel/TabPersistentStoreImpl.java      |   7 +

 .../browser/toolbar/ToolbarManager.java       |   3 +-

 .../browser/toolbar/ToolbarManager.java       |   1 +

 .../webapps/WebappIntentDataProvider.java     |  15 ++

 .../browser/android/historical_tab_saver.cc   |  24 ++-

 .../chrome_autocomplete_provider_client.cc    |   9 +
@@ -71,7 +71,6 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 .../browser/ui/native_page/NativePage.java    |  17 +-

 .../browser/omnibox/LocationBarMediator.java  |   8 +

 .../strings/android_chrome_strings.grd        |  25 +++

 .../browser/toolbar/LocationBarModel.java     |   3 +-

 chrome/browser/ui/messages/android/BUILD.gn   |   1 +

 .../snackbar/INeedSnackbarManager.java        |  28 +++

 .../search_engine_tab_helper.cc               |   6 +
@@ -88,7 +87,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 .../add-an-always-incognito-mode.inc          |   1 +

 .../add-an-always-incognito-mode.inc          |   3 +

 .../add-an-always-incognito-mode.inc          |   1 +

 69 files changed, 788 insertions(+), 103 deletions(-)

 68 files changed, 785 insertions(+), 101 deletions(-)

 create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml

 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java

 create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
@@ -1114,15 +1113,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar 
 import org.chromium.chrome.browser.IntentHandler;

 import org.chromium.chrome.browser.back_press.BackPressManager;

 import org.chromium.chrome.browser.back_press.BackPressMetrics;

@@ -888,7 +889,7 @@ public class ToolbarManager

                             }

                         },

                         mToolbarPositionSupplier,

-                        /* matchTrustedCdnUrl= */ mIsCustomTab);

+                        /* matchTrustedCdnUrl= */ mIsCustomTab, AlwaysIncognitoLinkInterceptor.isAlwaysIncognito());

         mControlContainer = controlContainer;

         mToolbarHairline = mControlContainer.findViewById(R.id.toolbar_hairline);

 

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappIntentDataProvider.java
@@ -1949,26 +1939,6 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro 
       <message name="IDS_QUICK_DELETE_DIALOG_SEARCH_HISTORY_DISAMBIGUATION_TEXT" desc="Text for signed in users only in the Quick Delete dialog, that is shown when the user clicks on 'Clear browsing data' option in the three dots menu, informing signed in users that search history and other forms of Activity saved in their Google account will not be deleted.">

         <ph name="BEGIN_LINK1">&lt;link1&gt;</ph>Search history<ph name="END_LINK1">&lt;/link1&gt;</ph> and <ph name="BEGIN_LINK2">&lt;link2&gt;</ph>other forms of activity<ph name="END_LINK2">&lt;/link2&gt;</ph> may be saved in your Google Account

       </message>

diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java

--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java

+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/LocationBarModel.java

@@ -168,6 +168,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro

     protected GURL mVisibleGurl = GURL.emptyGURL();

     protected String mFormattedFullUrl;

     protected String mUrlForDisplay;

+    private boolean mIsAlwaysIncognito;

 

     // notifyUrlChanged and notifySecurityStateChanged are usually called 3 times across a same

     // document navigation. The first call is usually necessary, which updates the UrlBar to reflect

@@ -214,7 +215,7 @@ public class LocationBarModel implements ToolbarDataProvider, LocationBarDataPro

             UrlFormatter urlFormatter,

             OfflineStatus offlineStatus,

             ObservableSupplier<@ControlsPosition Integer> toolbarPositionSupplier,

-            boolean matchTrustedCdnUrl) {

+            boolean matchTrustedCdnUrl, boolean isAlwaysIncognito) {

         mContext = context;

         mNtpDelegate = newTabPageDelegate;

         mUrlFormatter = urlFormatter;

diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn

--- a/chrome/browser/ui/messages/android/BUILD.gn

+++ b/chrome/browser/ui/messages/android/BUILD.gn

build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch

+3 −3
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ 
       config_(config) {

+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("omnibox-autocomplete-filtering")) {

+    const std::string flag_value = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII("omnibox-autocomplete-filtering");

+    provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH |

+    config_.provider_types &= AutocompleteProvider::TYPE_KEYWORD | AutocompleteProvider::TYPE_SEARCH |

+        AutocompleteProvider::TYPE_HISTORY_URL | AutocompleteProvider::TYPE_BOOKMARK | AutocompleteProvider::TYPE_BUILTIN;

+    if (!base::Contains(flag_value, "bookmarks"))

+      provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK;

+      config_.provider_types &= ~AutocompleteProvider::TYPE_BOOKMARK;

+    if (!base::Contains(flag_value, "chrome"))

+      provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;

+      config_.provider_types &= ~AutocompleteProvider::TYPE_BUILTIN;

+  }

   config_.provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();

build/patches/Add-lifetime-options-for-permissions.patch

+14 −5
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 components/permissions/permission_prompt.h    |  3 +-

 components/permissions/permission_request.cc  | 34 +++++++-

 components/permissions/permission_request.h   | 18 +++-

 .../permissions/permission_request_manager.cc | 45 ++++++----

 .../permissions/permission_request_manager.cc | 49 ++++++-----

 .../permissions/permission_request_manager.h  | 11 ++-

 37 files changed, 507 insertions(+), 73 deletions(-)

 37 files changed, 509 insertions(+), 75 deletions(-)



diff --git a/chrome/browser/permissions/last_tab_standing_tracker.cc b/chrome/browser/permissions/last_tab_standing_tracker.cc

--- a/chrome/browser/permissions/last_tab_standing_tracker.cc
@@ -1274,7 +1274,7 @@ diff --git a/components/permissions/permission_request.h b/components/permission 
diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc

--- a/components/permissions/permission_request_manager.cc

+++ b/components/permissions/permission_request_manager.cc

@@ -206,7 +206,7 @@ void PermissionRequestManager::AddRequest(

@@ -206,12 +206,12 @@ void PermissionRequestManager::AddRequest(

 

   if (base::CommandLine::ForCurrentProcess()->HasSwitch(

           switches::kDenyPermissionPrompts)) {
@@ -1283,9 +1283,18 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p 
     return;

   }

 

@@ -284,7 +284,7 @@ void PermissionRequestManager::AddRequest(

   if (display::Screen::Get()->IsHeadless()) {

-    request->PermissionDenied();

+    request->PermissionDenied(/*is_one_time*/false, content_settings::mojom::LifetimeMode::ALWAYS);

     return;

   }

 

@@ -282,9 +282,9 @@ void PermissionRequestManager::AddRequest(

 

   if (should_auto_approve_request) {

     if (should_auto_approve_request == PermissionAction::GRANTED) {

       request->PermissionGranted(/*is_one_time=*/false);

-      request->PermissionGranted(/*is_one_time=*/false);

+      request->PermissionGranted(/*is_one_time=*/false, content_settings::mojom::LifetimeMode::UNTIL_ORIGIN_CLOSED);

     } else if (should_auto_approve_request == PermissionAction::GRANTED_ONCE) {

-      request->PermissionGranted(/*is_one_time=*/true);

+      request->PermissionGranted(/*is_one_time=*/true, content_settings::mojom::LifetimeMode::UNTIL_ORIGIN_CLOSED);

build/patches/Add-option-to-force-tablet-UI.patch

+5 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
 .../java/res/layout/toolbar_tablet.xml        |  2 +-

 .../java/res/values-sw600dp/dimens.xml        |  5 +++--

 .../toolbar/java/res/values/dimens.xml        |  6 ++++--

 .../toolbar/top/ToolbarControlContainer.java  | 18 ++++++++++++++++++

 .../toolbar/top/ToolbarControlContainer.java  | 19 +++++++++++++++++++

 .../browser/toolbar/top/ToolbarLayout.java    |  5 ++++-

 .../tab_strip/HeightTransitionHandler.java    |  2 ++

 .../TabStripTransitionCoordinator.java        |  6 +++++-
@@ -37,7 +37,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html 
 .../accessibility/AccessibilitySettings.java  | 13 +++++++++++++

 .../AccessibilitySettingsDelegate.java        |  2 ++

 .../chromium/ui/base/DeviceFormFactor.java    | 14 ++++++++++++++

 33 files changed, 171 insertions(+), 25 deletions(-)

 33 files changed, 172 insertions(+), 25 deletions(-)



diff --git a/chrome/android/java/res/layout/custom_tabs_control_container.xml b/chrome/android/java/res/layout/custom_tabs_control_container.xml

--- a/chrome/android/java/res/layout/custom_tabs_control_container.xml
@@ -506,11 +506,12 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow 
 import android.graphics.Canvas;

 import android.graphics.Color;

 import android.graphics.PorterDuff;

@@ -165,6 +166,23 @@ public class ToolbarControlContainer extends OptimizedFrameLayout

@@ -165,6 +166,24 @@ public class ToolbarControlContainer extends OptimizedFrameLayout

     @Initializer

     public void initWithToolbar(int toolbarLayoutId, int toolbarLayoutHeightResId) {

         try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {

+            if (toolbarLayoutHeightResId != 0) {

+            if (DeviceFormFactor.isForceTabletUI() && toolbarLayoutHeightResId != 0) {

+                toolbarLayoutHeightResId = R.dimen.tab_strip_height_tabletui;

+                Resources res = getContext().getResources();

+                setMinimumHeight((int) res.getDimension(toolbarLayoutHeightResId));

+                int tab_strip_height =

build/patches/Add-option-to-use-home-page-as-NTP.patch

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser 
+            String url = urlConstantResolver.getNtpUrl();

+            if (UrlConstants.NTP_URL.equals(url)

+                    && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {

+                GURL gurl = HomepageManager.getInstance().getHomepageGurl();

+                GURL gurl = HomepageManager.getInstance().getHomepageGurl(profile.isIncognitoBranded());

+                url = gurl != null ? gurl.getSpec() : url;

+            }

             TabGroupUtils.openUrlInGroup(
@@ -76,7 +76,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser 
                     Tab parentTabToAttach = relatedTabs.get(relatedTabs.size() - 1);

+                    String url = urlConstantResolver.getNtpUrl();

+                    if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {

+                        GURL gurl = HomepageManager.getInstance().getHomepageGurl();

+                        GURL gurl = HomepageManager.getInstance().getHomepageGurl(currentTab.isIncognito());

+                        url = gurl != null ? gurl.getSpec() : url;

+                    }

                     mTabCreatorManager
@@ -122,7 +122,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over 
+                String url = UrlConstants.NTP_URL;

+                if (UrlConstants.NTP_URL.equals(url)

+                        && HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {

+                    GURL gurl = HomepageManager.getInstance().getHomepageGurl();

+                    GURL gurl = HomepageManager.getInstance().getHomepageGurl(tabModelSupplier.get().isIncognitoBranded());

+                    url = gurl != null ? gurl.getSpec() : url;

+                }

                 TabGroupUtils.openUrlInGroup(
@@ -222,7 +222,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/Chrome 
             String url, @TabLaunchType int type, @Nullable Intent intent, long intentTimestamp) {

+        if (!mIncognito && url.equals(UrlConstants.NTP_URL)) {

+            if (HomepageManager.getInstance().getPrefNTPIsHomepageEnabled()) {

+                GURL gurl = HomepageManager.getInstance().getHomepageGurl();

+                GURL gurl = HomepageManager.getInstance().getHomepageGurl(mIncognito);

+                url = gurl != null ? gurl.getSpec() : url;

+            }

+        }