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

Commit b78f8514 authored by Saalim Quadri's avatar Saalim Quadri Committed by Nishith Khanna
Browse files

[Auto] Update cromite patches 



Signed-off-by: default avatarSaalim Quadri <danascape@gmail.com>
parent 12ba2749

build/cromite_patches/Add-AllowUserCertificates-flag.patch

+7 −7
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java

@@ -236,6 +236,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

@@ -239,6 +239,7 @@ import org.chromium.content_public.browser.LoadUrlParams;

 import org.chromium.content_public.browser.SelectionPopupController;

 import org.chromium.content_public.browser.WebContents;

 import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
 import org.chromium.printing.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

@@ -985,6 +986,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -999,6 +1000,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

 

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
@@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv 
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

--- a/chrome/browser/flags/android/chrome_feature_list.cc

+++ b/chrome/browser/flags/android/chrome_feature_list.cc

@@ -184,6 +184,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =

@@ -768,6 +769,8 @@ public abstract class ChromeFeatureList {

@@ -796,6 +797,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =

             newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,9 +68,9 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sAppSpecificHistoryViewIntent =

             newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);

     public static final CachedFlag sAsyncNotificationManager =

@@ -1080,6 +1083,7 @@ public abstract class ChromeFeatureList {

                     sAccountForSuppressedKeyboardInsets,

                     sAllowTabClosingUponMinimization,

@@ -1131,6 +1134,7 @@ public abstract class ChromeFeatureList {

                     sAndroidAnimatedProgressBarInBrowser,

                     sAndroidAnimatedProgressBarInViz,

                     sAndroidAppIntegration,

+                    sAllowUserCertificates,

                     sAndroidAppIntegrationModule,

build/cromite_patches/Add-Alt-D-hotkey-to-focus-address-bar.patch

+10 −9
Original line number Diff line number Diff line
@@ -4,18 +4,19 @@ Subject: Add Alt+D hotkey to focus address bar 


License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 .../src/org/chromium/chrome/browser/KeyboardShortcuts.java   | 5 +++++

 1 file changed, 5 insertions(+)

 .../src/org/chromium/chrome/browser/KeyboardShortcuts.java  | 6 ++++++

 1 file changed, 6 insertions(+)



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

--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java

@@ -890,6 +890,11 @@ public class KeyboardShortcuts {

                     KeyEvent.KEYCODE_B,

                     (KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON));

@@ -895,6 +895,12 @@ public class KeyboardShortcuts {

                     KeyEvent.KEYCODE_ESCAPE,

                     KeyEvent.META_CTRL_ON);

         }

+        addShortcut(context,

+            shortcutGroupsById.get(R.string.keyboard_shortcut_chrome_feature_group_header),

+                    shortcutGroupsById,

+                    R.string.keyboard_shortcut_chrome_feature_group_header,

+                    R.string.keyboard_shortcut_address_bar,

+                    KeyEvent.KEYCODE_D,

+                    KeyEvent.META_ALT_ON);

build/cromite_patches/Add-a-proxy-configuration-page.patch

+7 −7
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java

@@ -100,6 +100,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

@@ -101,6 +101,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment

     private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";

     private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";

     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -89,7 +89,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting 
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

@@ -376,6 +376,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {

@@ -409,6 +409,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {

   builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);

 #endif

   builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
@@ -206,7 +206,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse 
 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)

 #include "chrome/browser/background/extensions/background_mode_manager.h"

 #endif

@@ -1605,6 +1607,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

@@ -1685,6 +1687,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

   component_updater::RegisterPrefs(registry);

   domain_reliability::RegisterPrefs(registry);

   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -661,7 +661,7 @@ new file mode 100644 
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn

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

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

@@ -169,6 +169,8 @@ static_library("ui") {

@@ -156,6 +156,8 @@ static_library("ui") {

     "webui/metrics_internals/metrics_internals_ui.h",

     "webui/net_export_ui.cc",

     "webui/net_export_ui.h",
@@ -683,7 +683,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u 
 #if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER)

 #include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h"

 #endif

@@ -422,7 +425,7 @@ void RegisterChromeWebUIConfigs() {

@@ -424,7 +427,7 @@ void RegisterChromeWebUIConfigs() {

   map.AddWebUIConfig(std::make_unique<glic::GlicUIConfig>());

   map.AddWebUIConfig(std::make_unique<glic::GlicFreUIConfig>());

 #endif
@@ -1135,7 +1135,7 @@ new file mode 100644 
diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_constants.cc

--- a/chrome/common/webui_url_constants.cc

+++ b/chrome/common/webui_url_constants.cc

@@ -50,6 +50,7 @@ bool IsSystemWebUIHost(std::string_view host) {

@@ -53,6 +53,7 @@ bool IsSystemWebUIHost(std::string_view host) {

       kChromeUILockScreenNetworkHost,

       kChromeUILockScreenStartReauthHost,

       kChromeUIMobileSetupHost,
@@ -1143,7 +1143,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons 
       kChromeUIMultiDeviceSetupHost,

       kChromeUINetworkHost,

       kChromeUINotificationTesterHost,

@@ -71,6 +72,7 @@ bool IsSystemWebUIHost(std::string_view host) {

@@ -74,6 +75,7 @@ bool IsSystemWebUIHost(std::string_view host) {

 // These hosts will also be suggested by BuiltinProvider.

 base::span<const base::cstring_view> ChromeURLHosts() {

   static constexpr auto kChromeURLHosts = std::to_array<base::cstring_view>({

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

+123 −132

File changed.

Preview size limit exceeded, changes collapsed.

build/cromite_patches/Add-autoplay-site-setting.patch

+9 −9
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ new file mode 100644 
+import org.chromium.components.browser_ui.site_settings.BromiteCustomContentSetting;

+import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;

+import org.chromium.components.browser_ui.site_settings.SiteSettingsCategory;

+import org.chromium.components.content_settings.ContentSettingValues;

+import org.chromium.components.content_settings.ContentSetting;

+import org.chromium.components.content_settings.ContentSettingsType;

+import org.chromium.content_public.browser.BrowserContextHandle;

+
@@ -177,8 +177,8 @@ new file mode 100644 
+public class BromiteAutoplayContentSetting extends BromiteCustomContentSetting {

+    public BromiteAutoplayContentSetting() {

+        super(/*contentSettingsType*/ ContentSettingsType.AUTOPLAY,

+              /*defaultEnabledValue*/ ContentSettingValues.ALLOW,

+              /*defaultDisabledValue*/ ContentSettingValues.BLOCK,

+              /*defaultEnabledValue*/ ContentSetting.ALLOW,

+              /*defaultDisabledValue*/ ContentSetting.BLOCK,

+              /*allowException*/ true,

+              /*preferenceKey*/ "autoplay",

+              /*profilePrefKey*/ "autoplay");
@@ -197,11 +197,11 @@ new file mode 100644 
+    }

+

+    @Override

+    public int getCategorySummary(@Nullable @ContentSettingValues int value) {

+    public int getCategorySummary(@Nullable @ContentSetting int value) {

+        switch (value) {

+            case ContentSettingValues.ALLOW:

+            case ContentSetting.ALLOW:

+                return R.string.website_settings_category_autoplay_enabled;

+            case ContentSettingValues.BLOCK:

+            case ContentSetting.BLOCK:

+                return R.string.website_settings_category_autoplay_disabled;

+            default:

+                return 0;
@@ -229,8 +229,8 @@ new file mode 100644 
+    }

+

+    @Override

+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSettingValues int value) {

+        return value != ContentSettingValues.BLOCK;

+    public @Nullable Boolean considerException(SiteSettingsCategory category, @ContentSetting int value) {

+        return value != ContentSetting.BLOCK;

+    }

+}

diff --git a/components/browser_ui/strings/bromite_content_settings/autoplay.grdp b/components/browser_ui/strings/bromite_content_settings/autoplay.grdp
@@ -308,7 +308,7 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/thi 
   if (!IsLockedPendingUserGesture())

     return false;

 

@@ -458,6 +461,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {

@@ -457,6 +460,17 @@ void AutoplayPolicy::MaybeSetAutoplayInitiated() {

   }

 }