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

Commit ebe28378 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Bump to 117.0.5938.140

parent 25f9aaf3

bromite/build/patches/AImageReader-CFI-crash-mitigations.patch

+20 −18
Original line number Original line Diff line number Diff line 
From 5d0142f62b1968bee7a6ffd114d07380e4ca15ca Mon Sep 17 00:00:00 2001

From 4f01cc05c38f2abb1fbbc71c679d03f02a06324f Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Tue, 5 May 2020 07:22:20 +0200

Date: Tue, 5 May 2020 07:22:20 +0200

Subject: [PATCH 106/192] AImageReader CFI crash mitigations

Subject: [PATCH 106/192] AImageReader CFI crash mitigations
@@ -29,11 +29,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 gpu/config/gpu_finch_features.h             |  1 +

 gpu/config/gpu_finch_features.h             |  1 +

 gpu/config/gpu_util.cc                      |  8 ++++++++

 gpu/config/gpu_util.cc                      |  8 ++++++++

 gpu/config/gpu_workaround_list.txt          |  1 +

 gpu/config/gpu_workaround_list.txt          |  1 +

 gpu/ipc/service/gpu_init.cc                 |  5 +++++

 gpu/ipc/service/gpu_init.cc                 |  7 +++++++

 gpu/ipc/service/stream_texture_android.cc   | 11 ++++++++++-

 gpu/ipc/service/stream_texture_android.cc   | 11 ++++++++++-

 media/base/media_switches.cc                |  5 +++++

 media/base/media_switches.cc                |  5 +++++

 media/base/media_switches.h                 |  1 +

 media/base/media_switches.h                 |  1 +

 12 files changed, 66 insertions(+), 5 deletions(-)

 12 files changed, 68 insertions(+), 5 deletions(-)





diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc

diff --git a/base/android/android_image_reader_compat.cc b/base/android/android_image_reader_compat.cc

index d26f7e8a19517..a20f33f114b91 100644

index d26f7e8a19517..a20f33f114b91 100644
@@ -85,10 +85,10 @@ index bef2ae103235c..b44886946d565 100644 
 

 

   AndroidImageReader();

   AndroidImageReader();

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

index d936cee457710..949773a2c7ff2 100644

index fded6daa7c8e2..a6d5da2c7c3a6 100644

--- a/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -2798,9 +2798,9 @@

@@ -2928,9 +2928,9 @@

     "expiry_milestone": 125

     "expiry_milestone": 125

   },

   },

   {

   {
@@ -102,10 +102,10 @@ index d936cee457710..949773a2c7ff2 100644 
   {

   {

     "name": "enable-immersive-fullscreen-toolbar",

     "name": "enable-immersive-fullscreen-toolbar",

diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json

diff --git a/gpu/config/gpu_driver_bug_list.json b/gpu/config/gpu_driver_bug_list.json

index 4e7fd14c5231f..827576124460a 100644

index 71a4f139d781f..7144b22e13688 100644

--- a/gpu/config/gpu_driver_bug_list.json

--- a/gpu/config/gpu_driver_bug_list.json

+++ b/gpu/config/gpu_driver_bug_list.json

+++ b/gpu/config/gpu_driver_bug_list.json

@@ -3698,6 +3698,22 @@

@@ -3688,6 +3688,22 @@

         "no_downscaled_overlay_promotion"

         "no_downscaled_overlay_promotion"

       ]

       ]

     },

     },
@@ -129,7 +129,7 @@ index 4e7fd14c5231f..827576124460a 100644 
       "id": 381,

       "id": 381,

       "cr_bugs": [

       "cr_bugs": [

diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc

diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc

index eb8057834e27f..a949cb3623385 100644

index f0138acdeae0c..76c2d34ed046a 100644

--- a/gpu/config/gpu_finch_features.cc

--- a/gpu/config/gpu_finch_features.cc

+++ b/gpu/config/gpu_finch_features.cc

+++ b/gpu/config/gpu_finch_features.cc

@@ -65,6 +65,11 @@ BASE_FEATURE(kUseGles2ForOopR,

@@ -65,6 +65,11 @@ BASE_FEATURE(kUseGles2ForOopR,
@@ -145,7 +145,7 @@ index eb8057834e27f..a949cb3623385 100644 
 // Use android SurfaceControl API for managing display compositor's buffer queue

 // Use android SurfaceControl API for managing display compositor's buffer queue

 // and using overlays on Android. Also used by webview to disable surface

 // and using overlays on Android. Also used by webview to disable surface

diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h

diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h

index 785791599ecce..824d0dbb18dfe 100644

index c77113dda67c4..662e100792a16 100644

--- a/gpu/config/gpu_finch_features.h

--- a/gpu/config/gpu_finch_features.h

+++ b/gpu/config/gpu_finch_features.h

+++ b/gpu/config/gpu_finch_features.h

@@ -17,6 +17,7 @@ namespace features {

@@ -17,6 +17,7 @@ namespace features {
@@ -183,10 +183,10 @@ index 82528e1b97ab6..572ea0893e45e 100644 
 

 

 // Estimates roughly user total disk space by counting in the drives where

 // Estimates roughly user total disk space by counting in the drives where

diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt

diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list.txt

index 5530042f3a807..e897fc62cb449 100644

index 164df51c709af..f2a7ebad434c3 100644

--- a/gpu/config/gpu_workaround_list.txt

--- a/gpu/config/gpu_workaround_list.txt

+++ b/gpu/config/gpu_workaround_list.txt

+++ b/gpu/config/gpu_workaround_list.txt

@@ -15,6 +15,7 @@ decode_encode_srgb_for_generatemipmap

@@ -16,6 +16,7 @@ decode_encode_srgb_for_generatemipmap

 depth_stencil_renderbuffer_resize_emulation

 depth_stencil_renderbuffer_resize_emulation

 disable_2d_canvas_auto_flush

 disable_2d_canvas_auto_flush

 disable_accelerated_av1_decode

 disable_accelerated_av1_decode
@@ -195,23 +195,25 @@ index 5530042f3a807..e897fc62cb449 100644 
 disable_accelerated_h264_decode

 disable_accelerated_h264_decode

 disable_accelerated_h264_encode

 disable_accelerated_h264_encode

diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc

diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc

index e122255a4e94c..cd535f6040c17 100644

index e8af3b3325636..ae69ecc8a7384 100644

--- a/gpu/ipc/service/gpu_init.cc

--- a/gpu/ipc/service/gpu_init.cc

+++ b/gpu/ipc/service/gpu_init.cc

+++ b/gpu/ipc/service/gpu_init.cc

@@ -616,6 +616,11 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

@@ -628,6 +628,13 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandLine* command_line,

   }

   }

 #endif  // BUILDFLAG(IS_WIN)

 #endif  // BUILDFLAG(IS_WIN)

 

 

+#if BUILDFLAG(IS_ANDROID)

+  // Disable AImageReader if the workaround is enabled.

+  // Disable AImageReader if the workaround is enabled.

+  if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {

+  if (gpu_feature_info_.IsWorkaroundEnabled(DISABLE_AIMAGEREADER)) {

+    base::android::AndroidImageReader::DisableSupport();

+    base::android::AndroidImageReader::DisableSupport();

+  }

+  }

+#endif

+

+

   if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] !=

   if (gpu_feature_info_.status_values[GPU_FEATURE_TYPE_VULKAN] !=

           kGpuFeatureStatusEnabled ||

           kGpuFeatureStatusEnabled ||

       !InitializeVulkan()) {

       !InitializeVulkan()) {

diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc

diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc

index 5dcfbd4be3fdc..1adbf4683ad8c 100644

index 762b8dabc387c..8939050c6f817 100644

--- a/gpu/ipc/service/stream_texture_android.cc

--- a/gpu/ipc/service/stream_texture_android.cc

+++ b/gpu/ipc/service/stream_texture_android.cc

+++ b/gpu/ipc/service/stream_texture_android.cc

@@ -6,6 +6,7 @@

@@ -6,6 +6,7 @@
@@ -240,10 +242,10 @@ index 5dcfbd4be3fdc..1adbf4683ad8c 100644 
              : TextureOwner::Mode::kSurfaceTextureInsecure;

              : TextureOwner::Mode::kSurfaceTextureInsecure;

 }

 }

diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc

diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc

index 3352c21226ff9..a2a99a11eb82f 100644

index 2c8a257f5ea4a..c1c11e4a8b615 100644

--- a/media/base/media_switches.cc

--- a/media/base/media_switches.cc

+++ b/media/base/media_switches.cc

+++ b/media/base/media_switches.cc

@@ -946,6 +946,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,

@@ -950,6 +950,11 @@ BASE_FEATURE(kHardwareSecureDecryptionExperiment,

 // Allows automatically disabling hardware secure Content Decryption Module

 // Allows automatically disabling hardware secure Content Decryption Module

 // (CDM) after failures or crashes to fallback to software secure CDMs. If this

 // (CDM) after failures or crashes to fallback to software secure CDMs. If this

 // feature is disabled, the fallback will never happen and users could be stuck

 // feature is disabled, the fallback will never happen and users could be stuck
@@ -256,10 +258,10 @@ index 3352c21226ff9..a2a99a11eb82f 100644 
 BASE_FEATURE(kHardwareSecureDecryptionFallback,

 BASE_FEATURE(kHardwareSecureDecryptionFallback,

              "HardwareSecureDecryptionFallback",

              "HardwareSecureDecryptionFallback",

diff --git a/media/base/media_switches.h b/media/base/media_switches.h

diff --git a/media/base/media_switches.h b/media/base/media_switches.h

index 81f2f07bef7f5..d9259debfdffa 100644

index e59c53e4bb47d..1bbc1ee4056aa 100644

--- a/media/base/media_switches.h

--- a/media/base/media_switches.h

+++ b/media/base/media_switches.h

+++ b/media/base/media_switches.h

@@ -327,6 +327,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);

@@ -328,6 +328,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoBlitColorAccuracy);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoToolboxVideoDecoder);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kVideoToolboxVideoDecoder);

 #endif  // BUILDFLAG(IS_APPLE)

 #endif  // BUILDFLAG(IS_APPLE)

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebRTCColorAccuracy);

 MEDIA_EXPORT BASE_DECLARE_FEATURE(kWebRTCColorAccuracy);

bromite/build/patches/Add-AllowUserCertificates-flag.patch

+33 −30
Original line number Original line Diff line number Diff line 
From 24643d42b1e735d4b77c238d385ee956e777f197 Mon Sep 17 00:00:00 2001

From c2c6c28c0a830799a637c647f8fecea70a240c6d Mon Sep 17 00:00:00 2001

From: uazo <uazo@users.noreply.github.com>

From: uazo <uazo@users.noreply.github.com>

Date: Mon, 26 Apr 2021 13:28:24 +0000

Date: Mon, 26 Apr 2021 13:28:24 +0000

Subject: [PATCH 130/192] Add AllowUserCertificates flag

Subject: [PATCH 130/192] Add AllowUserCertificates flag
@@ -6,21 +6,21 @@ Subject: [PATCH 130/192] Add AllowUserCertificates flag 
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html

Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html

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

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

---

---

 .../src/org/chromium/chrome/browser/app/ChromeActivity.java  | 3 +++

 .../org/chromium/chrome/browser/app/ChromeActivity.java    | 3 +++

 chrome/browser/about_flags.cc                                | 4 ++++

 chrome/browser/about_flags.cc                              | 7 +++++++

 chrome/browser/flag_descriptions.cc                        | 5 +++++

 chrome/browser/flag_descriptions.cc                        | 5 +++++

 chrome/browser/flag_descriptions.h                         | 3 +++

 chrome/browser/flag_descriptions.h                         | 3 +++

 chrome/browser/flags/android/chrome_feature_list.cc        | 5 +++++

 chrome/browser/flags/android/chrome_feature_list.cc        | 5 +++++

 chrome/browser/flags/android/chrome_feature_list.h         | 1 +

 chrome/browser/flags/android/chrome_feature_list.h         | 1 +

 .../org/chromium/chrome/browser/flags/ChromeFeatureList.java | 4 ++++

 .../chromium/chrome/browser/flags/ChromeFeatureList.java   | 4 ++++

 net/android/java/src/org/chromium/net/X509Util.java        | 5 +++++

 net/android/java/src/org/chromium/net/X509Util.java        | 5 +++++

 8 files changed, 30 insertions(+)

 8 files changed, 33 insertions(+)





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

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

index b055fe5329377..29470425403e0 100644

index a4956e49ad6b7..dd309ae5dcfd9 100644

--- a/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

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

@@ -231,6 +231,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;

@@ -230,6 +230,7 @@ import org.chromium.content_public.browser.ScreenOrientationProvider;

 import org.chromium.content_public.browser.SelectionPopupController;

 import org.chromium.content_public.browser.SelectionPopupController;

 import org.chromium.content_public.browser.WebContents;

 import org.chromium.content_public.browser.WebContents;

 import org.chromium.content_public.common.ContentSwitches;

 import org.chromium.content_public.common.ContentSwitches;
@@ -28,7 +28,7 @@ index b055fe5329377..29470425403e0 100644 
 import org.chromium.printing.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

 import org.chromium.printing.PrintingControllerImpl;

@@ -973,6 +974,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

@@ -981,6 +982,8 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

         super.onStartWithNative();

         super.onStartWithNative();

         ChromeActivitySessionTracker.getInstance().onStartWithNative();

         ChromeActivitySessionTracker.getInstance().onStartWithNative();

         ChromeCachedFlags.getInstance().cacheNativeFlags();

         ChromeCachedFlags.getInstance().cacheNativeFlags();
@@ -38,22 +38,25 @@ index b055fe5329377..29470425403e0 100644 
         // postDeferredStartupIfNeeded() is called in TabModelSelectorTabObsever#onLoadStopped(),

         // postDeferredStartupIfNeeded() is called in TabModelSelectorTabObsever#onLoadStopped(),

         // #onPageLoadFinished() and #onCrash(). If we are not actively loading a tab (e.g.

         // #onPageLoadFinished() and #onCrash(). If we are not actively loading a tab (e.g.

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

index c0a1b31295fdb..4a0b8ff904c15 100644

index 1b2515a172b22..a30a18f00179e 100644

--- a/chrome/browser/about_flags.cc

--- a/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

@@ -9188,6 +9188,10 @@ const FeatureEntry kFeatureEntries[] = {

@@ -9309,6 +9309,13 @@ const FeatureEntry kFeatureEntries[] = {

      flag_descriptions::kHttpsUpgradesDescription, kOsDesktop | kOsAndroid,

      flag_descriptions::kEnableDrDcDescription, kOsAll,

      FEATURE_VALUE_TYPE(features::kHttpsUpgrades)},

      FEATURE_VALUE_TYPE(features::kEnableDrDc)},

 

 

+#if BUILDFLAG(IS_ANDROID)

+    {"allow-user-certificates",

+    {"allow-user-certificates",

+     flag_descriptions::kAllowUserCertificatesName,

+     flag_descriptions::kAllowUserCertificatesName,

+     flag_descriptions::kAllowUserCertificatesDescription, kOsAndroid,

+     flag_descriptions::kAllowUserCertificatesDescription, kOsAndroid,

+     FEATURE_VALUE_TYPE(chrome::android::kAllowUserCertificates)},

+     FEATURE_VALUE_TYPE(chrome::android::kAllowUserCertificates)},

     {"omnibox-updated-connection-security-indicators",

+#endif  // BUILDFLAG(IS_ANDROID)

      flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsName,

+

      flag_descriptions::kOmniboxUpdatedConnectionSecurityIndicatorsDescription,

     {"force-gpu-main-thread-to-normal-priority-drdc",

      flag_descriptions::kForceGpuMainThreadToNormalPriorityDrDcName,

      flag_descriptions::kForceGpuMainThreadToNormalPriorityDrDcDescription,

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc

index 425a6ddaa75ed..9961b08c2e5a8 100644

index 9faf86f94d203..4032bab43c722 100644

--- a/chrome/browser/flag_descriptions.cc

--- a/chrome/browser/flag_descriptions.cc

+++ b/chrome/browser/flag_descriptions.cc

+++ b/chrome/browser/flag_descriptions.cc

@@ -16,6 +16,11 @@

@@ -16,6 +16,11 @@
@@ -69,7 +72,7 @@ index 425a6ddaa75ed..9961b08c2e5a8 100644 
 const char kAccelerated2dCanvasDescription[] =

 const char kAccelerated2dCanvasDescription[] =

     "Enables the use of the GPU to perform 2d canvas rendering instead of "

     "Enables the use of the GPU to perform 2d canvas rendering instead of "

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h

index 9625553e578fb..992e8dcc0d6c4 100644

index c095902cd95fc..e95beecefb599 100644

--- a/chrome/browser/flag_descriptions.h

--- a/chrome/browser/flag_descriptions.h

+++ b/chrome/browser/flag_descriptions.h

+++ b/chrome/browser/flag_descriptions.h

@@ -42,6 +42,9 @@ namespace flag_descriptions {

@@ -42,6 +42,9 @@ namespace flag_descriptions {
@@ -83,7 +86,7 @@ index 9625553e578fb..992e8dcc0d6c4 100644 
 extern const char kAccelerated2dCanvasDescription[];

 extern const char kAccelerated2dCanvasDescription[];

 

 

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc

index 68ec6f5c77d55..b7c3b47e7fab2 100644

index 81cadb4071645..45fb8f39dd1dd 100644

--- a/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

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

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

@@ -142,6 +142,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -94,7 +97,7 @@ index 68ec6f5c77d55..b7c3b47e7fab2 100644 
     &feed::kInterestFeedV2,

     &feed::kInterestFeedV2,

     &feed::kInterestFeedV2Autoplay,

     &feed::kInterestFeedV2Autoplay,

     &feed::kInterestFeedV2Hearts,

     &feed::kInterestFeedV2Hearts,

@@ -458,6 +459,10 @@ BASE_FEATURE(kSearchReadyOmniboxFeature,

@@ -467,6 +468,10 @@ BASE_FEATURE(kSearchReadyOmniboxFeature,

              "SearchReadyOmnibox",

              "SearchReadyOmnibox",

              base::FEATURE_DISABLED_BY_DEFAULT);

              base::FEATURE_DISABLED_BY_DEFAULT);
@@ -106,11 +109,11 @@ index 68ec6f5c77d55..b7c3b47e7fab2 100644 
              "FocusOmniboxInIncognitoTabIntents",

              "FocusOmniboxInIncognitoTabIntents",

              base::FEATURE_ENABLED_BY_DEFAULT);

              base::FEATURE_ENABLED_BY_DEFAULT);

diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h

diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h

index b4d994655a6bd..d37e3e41ba30a 100644

index b24ca80ae7978..f279afd2d62f0 100644

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

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

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

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

@@ -20,6 +20,7 @@ BASE_DECLARE_FEATURE(kAdaptiveButtonInTopToolbarCustomizationV2);

@@ -22,6 +22,7 @@ BASE_DECLARE_FEATURE(kAdvancedPeripheralsSupport);

 BASE_DECLARE_FEATURE(kAddToHomescreenIPH);

 BASE_DECLARE_FEATURE(kAdvancedPeripheralsSupportTabStrip);

 BASE_DECLARE_FEATURE(kAllowNewIncognitoTabIntents);

 BASE_DECLARE_FEATURE(kAllowNewIncognitoTabIntents);

 BASE_DECLARE_FEATURE(kAndroidAppIntegration);

 BASE_DECLARE_FEATURE(kAndroidAppIntegration);

+BASE_DECLARE_FEATURE(kAllowUserCertificates);

+BASE_DECLARE_FEATURE(kAllowUserCertificates);
@@ -118,7 +121,7 @@ index b4d994655a6bd..d37e3e41ba30a 100644 
 BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification);

 BASE_DECLARE_FEATURE(kAndroidSearchEngineChoiceNotification);

 BASE_DECLARE_FEATURE(kAndroidImprovedBookmarks);

 BASE_DECLARE_FEATURE(kAndroidImprovedBookmarks);

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

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

index b748aa6f4d7b6..5e9a79513b9a6 100644

index cd651e7d1a787..d0d1a4271442a 100644

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -98,6 +98,7 @@ public abstract class ChromeFeatureList {

@@ -98,6 +98,7 @@ public abstract class ChromeFeatureList {
@@ -129,7 +132,7 @@ index b748aa6f4d7b6..5e9a79513b9a6 100644 
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_TRANSLATE =

             "AdaptiveButtonInTopToolbarTranslate";

             "AdaptiveButtonInTopToolbarTranslate";

@@ -499,6 +500,8 @@ public abstract class ChromeFeatureList {

@@ -504,6 +505,8 @@ public abstract class ChromeFeatureList {

     public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting";

     public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting";

 

 

     /* Alphabetical: */

     /* Alphabetical: */
@@ -138,7 +141,7 @@ index b748aa6f4d7b6..5e9a79513b9a6 100644 
     public static final CachedFlag sAppMenuMobileSiteOption =

     public static final CachedFlag sAppMenuMobileSiteOption =

             new CachedFlag(APP_MENU_MOBILE_SITE_OPTION, false);

             new CachedFlag(APP_MENU_MOBILE_SITE_OPTION, false);

     public static final CachedFlag sBackGestureActivityTabProvider =

     public static final CachedFlag sBackGestureActivityTabProvider =

@@ -622,6 +625,7 @@ public abstract class ChromeFeatureList {

@@ -629,6 +632,7 @@ public abstract class ChromeFeatureList {

 

 

     public static final List<CachedFlag> sFlagsCachedFullBrowser = List.of(

     public static final List<CachedFlag> sFlagsCachedFullBrowser = List.of(

             // clang-format off

             // clang-format off

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

+3 −3
Original line number Original line Diff line number Diff line 
From 5580c3b75933c9ac62c21f19fe63b579b587be5e Mon Sep 17 00:00:00 2001

From bdd8e07d76dd8f5e2b18fdc6117ecf6c657dd2d0 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Tue, 9 Mar 2021 19:43:00 +0100

Date: Tue, 9 Mar 2021 19:43:00 +0100

Subject: [PATCH 128/192] Add Alt+D hotkey to focus address bar

Subject: [PATCH 128/192] Add Alt+D hotkey to focus address bar
@@ -9,10 +9,10 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html 
 1 file changed, 2 insertions(+)

 1 file changed, 2 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

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

index 73aec26a909ab..c970a8f286c5f 100644

index 736a851a56bb4..dfea155c7c963 100644

--- a/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

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

@@ -151,6 +151,8 @@ public class KeyboardShortcuts {

@@ -152,6 +152,8 @@ public class KeyboardShortcuts {

                 KeyEvent.KEYCODE_F, KeyEvent.META_CTRL_ON);

                 KeyEvent.KEYCODE_F, KeyEvent.META_CTRL_ON);

         addShortcut(context, chromeFeatureShortcutGroup, R.string.keyboard_shortcut_address_bar,

         addShortcut(context, chromeFeatureShortcutGroup, R.string.keyboard_shortcut_address_bar,

                 KeyEvent.KEYCODE_L, KeyEvent.META_CTRL_ON);

                 KeyEvent.KEYCODE_L, KeyEvent.META_CTRL_ON);

bromite/build/patches/Add-DuckDuckGo-Lite-search-engine.patch

+1 −1
Original line number Original line Diff line number Diff line 
From cf7f684447e3944efb1c65e65144d62c94d5f589 Mon Sep 17 00:00:00 2001

From 84df6b7913e85a3fcef6625a29ff68900f54bbc5 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Thu, 12 Oct 2017 11:06:18 +0200

Date: Thu, 12 Oct 2017 11:06:18 +0200

Subject: [PATCH 048/192] Add DuckDuckGo Lite search engine

Subject: [PATCH 048/192] Add DuckDuckGo Lite search engine

bromite/build/patches/Add-English-only-search-engine.patch

+1 −1
Original line number Original line Diff line number Diff line 
From ef9990665f73acb206e2b14d1f41e5d69f841013 Mon Sep 17 00:00:00 2001

From 54421bb51eb370e84a9ca4e6070e831fbedbdcd8 Mon Sep 17 00:00:00 2001

From: csagan5 <32685696+csagan5@users.noreply.github.com>

From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Mon, 11 Dec 2017 22:42:11 +0100

Date: Mon, 11 Dec 2017 22:42:11 +0100

Subject: [PATCH 047/192] Add English-only search engine

Subject: [PATCH 047/192] Add English-only search engine