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

Unverified Commit 64656694 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Patches for v147 (final)

parent 130b90c9

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

+21 −11
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 .../tabmodel/TabModelSelectorImpl.java        |   3 +

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

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

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

 .../webapps/WebappIntentDataProvider.java     |  16 ++

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

 .../chrome_autocomplete_provider_client.cc    |   9 +

 .../chrome_autocomplete_provider_client.h     |   1 +
@@ -68,7 +68,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 chrome/browser/prefs/browser_prefs.cc         |   5 +

 chrome/browser/profiles/profile_selections.cc |  10 +

 chrome/browser/profiles/profile_selections.h  |   7 +-

 .../signin/services/ProfileDataCache.java     |  16 +-

 .../signin/services/ProfileDataCache.java     |  18 +-

 .../browser/ui/android/native_page/BUILD.gn   |   2 +

 .../browser/ui/native_page/NativePage.java    |  17 +-

 .../browser/omnibox/LocationBarMediator.java  |   8 +
@@ -89,7 +89,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 +

 70 files changed, 811 insertions(+), 118 deletions(-)

 70 files changed, 812 insertions(+), 120 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
@@ -1127,16 +1127,17 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar 
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

@@ -33,6 +33,8 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;

@@ -33,6 +33,9 @@ import org.chromium.components.browser_ui.widget.TintedDrawable;

 import org.chromium.device.mojom.ScreenOrientationLockType;

 import org.chromium.ui.util.ColorUtils;

 

+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;

+import org.chromium.chrome.browser.flags.CustomTabProfileType;

+

 /** Stores info about a web app. */

 @NullMarked

 public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider {

@@ -47,6 +49,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider

@@ -47,6 +50,8 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider

     private final ColorProviderImpl mDarkColorProvider;

     private @DisplayMode.EnumType int mResolvedDisplayMode = DisplayMode.UNDEFINED;
@@ -1145,7 +1146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI 
     /** Returns the toolbar color to use if a custom color is not specified by the webapp. */

     public static int getDefaultToolbarColor() {

         return Color.WHITE;

@@ -82,6 +86,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider

@@ -82,6 +87,10 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider

         mWebappExtras = webappExtras;

         mWebApkExtras = webApkExtras;

         mActivityType = (webApkExtras != null) ? ActivityType.WEB_APK : ActivityType.WEBAPP;
@@ -1156,7 +1157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI 
     }

 

     @Override

@@ -177,6 +185,13 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider

@@ -177,6 +186,13 @@ public class WebappIntentDataProvider extends BrowserServicesIntentDataProvider

         return mWebApkExtras;

     }
@@ -1914,7 +1915,16 @@ diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome 
         mImageSize = imageSize;

         mDefaultBadgeConfig = badgeConfig;

         mPlaceholderImage = getScaledPlaceholderImage(context, imageSize);

@@ -266,7 +263,6 @@ public class ProfileDataCache implements IdentityManager.Observer, AccountsChang

@@ -255,8 +252,6 @@ public class ProfileDataCache implements IdentityManager.Observer, AccountsChang

             return;

         }

         mPerAccountBadgeConfig.put(accountId, badgeConfig);

-        var accountInfo = mIdentityManager.findExtendedAccountInfoByAccountId(accountId);

-        onExtendedAccountInfoUpdated(accountInfo);

     }

 

     /**

@@ -266,7 +261,6 @@ public class ProfileDataCache implements IdentityManager.Observer, AccountsChang

         ThreadUtils.assertOnUiThread();

         if (mObservers.isEmpty()) {

             mAccountManagerFacade.addObserver(this);
@@ -1922,7 +1932,7 @@ diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome 
         }

         mObservers.addObserver(observer);

     }

@@ -279,7 +275,6 @@ public class ProfileDataCache implements IdentityManager.Observer, AccountsChang

@@ -279,7 +273,6 @@ public class ProfileDataCache implements IdentityManager.Observer, AccountsChang

         mObservers.removeObserver(observer);

         if (mObservers.isEmpty()) {

             mAccountManagerFacade.removeObserver(this);
@@ -1930,7 +1940,7 @@ diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome 
         }

     }

 

@@ -311,6 +306,7 @@ public class ProfileDataCache implements IdentityManager.Observer, AccountsChang

@@ -311,6 +304,7 @@ public class ProfileDataCache implements IdentityManager.Observer, AccountsChang

     }

 

     private void updateCache() {
@@ -1938,7 +1948,7 @@ diff --git a/chrome/browser/signin/services/android/java/src/org/chromium/chrome 
         var accounts = mAccountManagerFacade.getAccounts();

         if (!accounts.isFulfilled()) {

             // When the list of accounts is ready - onCoreAccountInfosChanged will call

@@ -320,14 +316,6 @@ public class ProfileDataCache implements IdentityManager.Observer, AccountsChang

@@ -320,14 +314,6 @@ public class ProfileDataCache implements IdentityManager.Observer, AccountsChang

 

         List<AccountsCache.AccountEntry> displayableAccounts = new ArrayList<>();

         for (CoreAccountInfo account : accounts.getResult()) {

build/patches/Add-bookmark-import-export-actions.patch

+3 −12
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 .../browser/TabbedModeTabDelegateFactory.java |   5 +-

 .../app/bookmarks/BookmarkActivity.java       |  20 ++

 .../native_page/NativePageFactory.java        |   7 +-

 chrome/browser/BUILD.gn                       |   9 +

 chrome/browser/BUILD.gn                       |   7 +

 .../bookmarks/android/bookmark_bridge.cc      | 193 ++++++++++++

 .../bookmarks/android/bookmark_bridge.h       |  30 +-

 .../browser/bookmarks/BookmarkBridge.java     |  39 +++
@@ -51,7 +51,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 ui/shell_dialogs/select_file_dialog_linux.cc  |   4 +

 ui/shell_dialogs/select_file_dialog_linux.h   |   2 +

 ui/shell_dialogs/select_file_dialog_win.cc    |   5 +

 40 files changed, 792 insertions(+), 21 deletions(-)

 40 files changed, 790 insertions(+), 21 deletions(-)

 create mode 100644 cromite_flags/chrome/browser/about_flags_cc/add-bookmark-import-export-actions.inc

 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_cc/add-bookmark-import-export-actions.inc

 create mode 100644 cromite_flags/chrome/browser/flags/android/chrome_feature_list_h/add-bookmark-import-export-actions.inc
@@ -205,16 +205,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat 
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn

--- a/chrome/browser/BUILD.gn

+++ b/chrome/browser/BUILD.gn

@@ -210,6 +210,8 @@ static_library("browser") {

     "bad_message.h",

     "browser_about_handler.cc",

     "browser_about_handler.h",

+    "bookmarks/bookmark_html_writer.cc",

+    "bookmarks/bookmark_html_writer.h",

     "browser_features.cc",

     "browser_features.h",

     "browser_process_impl.cc",

@@ -1327,6 +1329,13 @@ static_library("browser") {

@@ -1327,6 +1327,13 @@ static_library("browser") {

     "webauthn/webauthn_switches.cc",

   ]

build/patches/Add-cromite-flags-support.patch

+5 −3
Original line number Diff line number Diff line
@@ -1580,7 +1580,7 @@ diff --git a/components/webui/flags/resources/experiment.css b/components/webui/ 
 }

 

+.experiment-on select {

+  background: #dddddd;

+  background: #ddd;

+  color: var(--link-color);

+}

+
@@ -1722,11 +1722,13 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c 
diff --git a/content/public/common/content_features.h b/content/public/common/content_features.h

--- a/content/public/common/content_features.h

+++ b/content/public/common/content_features.h

@@ -440,4 +440,5 @@ CONTENT_EXPORT bool IsFluidResizeEnabled();

@@ -438,6 +438,7 @@ CONTENT_EXPORT bool IsPushSubscriptionChangeEventEnabled();

 CONTENT_EXPORT bool IsFluidResizeEnabled();

 #endif

 

+#include "cromite_flags/content_public_common_content_features_h.inc"

 }  // namespace features

 

+#include "cromite_flags/content_public_common_content_features_h.inc"

 #endif  // CONTENT_PUBLIC_COMMON_CONTENT_FEATURES_H_

diff --git a/cromite_flags/BUILD.gn b/cromite_flags/BUILD.gn

new file mode 100755

build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn

--- a/build/config/compiler/BUILD.gn

+++ b/build/config/compiler/BUILD.gn

@@ -661,7 +661,7 @@ config("compiler") {

@@ -669,7 +669,7 @@ config("compiler") {

     # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds.

     # It also causes segfault on Linux s390x:

     # https://github.com/llvm/llvm-project/issues/149511

build/patches/Add-menu-item-to-bookmark-all-tabs.patch

+12 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 .../bookmarks/bookmark_parent_folder.cc       |  1 +

 .../permanent_folder_ordering_tracker.cc      |  2 +

 .../dialogs/DownloadLocationCustomView.java   |  4 +-

 .../strings/android_chrome_strings.grd        |  3 ++

 .../strings/android_chrome_strings.grd        |  6 +--

 .../bookmark_ui_operations_helper.cc          |  2 +

 .../bookmark_bar_page_handler.cc              |  2 +

 components/bookmark_bar_strings.grdp          |  6 +++
@@ -31,7 +31,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 components/bookmarks/browser/bookmark_uuids.h |  1 +

 components/bookmarks/browser/model_loader.cc  |  9 +++-

 .../bookmark_specifics_conversions.cc         |  1 +

 27 files changed, 251 insertions(+), 11 deletions(-)

 27 files changed, 251 insertions(+), 14 deletions(-)



diff --git a/chrome/android/java/res/values/ids.xml b/chrome/android/java/res/values/ids.xml

--- a/chrome/android/java/res/values/ids.xml
@@ -470,6 +470,16 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro 
       <message name="IDS_MENU_GET_IMAGE_DESCRIPTIONS" desc="Menu item to start getting alt text accessibility image labels/descriptions [CHAR_LIMIT=27]">

         Get image descriptions

       </message>

@@ -4733,9 +4736,6 @@ To change this setting, <ph name="BEGIN_LINK">BEGIN_LINK</ph>delete the Chrome d

       <message name="IDS_MENU_REOPEN_CLOSED_GROUP" desc="Menu item for reopening the last closed tab group.">

         Reopen closed group

       </message>

-      <message name="IDS_MENU_BOOKMARK_ALL_TABS" desc="Menu item for bookmarking all tabs.">

-        Bookmark all tabs

-      </message>

       <message name="IDS_MENU_UNPIN_GLIC_BUTTON" desc="Menu item for unpinning the tab strip Glic button.">

         Unpin

       </message>

diff --git a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc

--- a/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc

+++ b/chrome/browser/ui/bookmarks/bookmark_ui_operations_helper.cc