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

Commit 7f52575b authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3100-master-134' into 'master' 

Update browser to v134

See merge request !80
parents f027e876 51f49a02

Dockerfile

+1 −1
Original line number Original line Diff line number Diff line 
FROM ubuntu:20.04

FROM ubuntu:20.04





ENV CHROMIUM_DIR "/srv/chromium"

ENV CHROMIUM_DIR "/srv/chromium"

ENV CHROMIUM_VER "133.0.6943.99"

ENV CHROMIUM_VER "134.0.6998.89"





RUN apt-get update && \

RUN apt-get update && \

    DEBIAN_FRONTEND=noninteractive \

    DEBIAN_FRONTEND=noninteractive \

build/cromite_patches/AImageReader-CFI-crash-mitigations.patch

+6 −6
Original line number Original line Diff line number Diff line
@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i 
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

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

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

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

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

@@ -3219,6 +3219,10 @@

@@ -3224,6 +3224,10 @@

     "name": "enable-identity-in-auth-error",

     "name": "enable-identity-in-auth-error",

     "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],

     "owners": [ "jlebel@chromium.org", "chrome-signin-team@google.com" ],

     "expiry_milestone": 135

     "expiry_milestone": 135
@@ -119,7 +119,7 @@ new file mode 100644 
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

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

@@ -2605,6 +2605,22 @@

@@ -2593,6 +2593,22 @@

         "no_downscaled_overlay_promotion"

         "no_downscaled_overlay_promotion"

       ]

       ]

     },

     },
@@ -181,7 +181,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc 
   if (!gpu_preferences.enable_android_surface_control)

   if (!gpu_preferences.enable_android_surface_control)

     return kGpuFeatureStatusDisabled;

     return kGpuFeatureStatusDisabled;

 

 

@@ -379,6 +382,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,

@@ -375,6 +378,11 @@ void AdjustGpuFeatureStatusToWorkarounds(GpuFeatureInfo* gpu_feature_info,

           kGpuFeatureStatusSoftware;

           kGpuFeatureStatusSoftware;

     }

     }

   }

   }
@@ -196,7 +196,7 @@ diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc 
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

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

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

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

 check_ycbcr_studio_g22_left_p709_for_nv12_support

 check_ycbcr_studio_g22_left_p709_for_nv12_support

 disable_2d_canvas_auto_flush

 disable_2d_canvas_auto_flush

 disable_accelerated_av1_decode

 disable_accelerated_av1_decode
@@ -207,7 +207,7 @@ diff --git a/gpu/config/gpu_workaround_list.txt b/gpu/config/gpu_workaround_list 
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

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

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

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

 

 

 #if BUILDFLAG(IS_ANDROID)

 #if BUILDFLAG(IS_ANDROID)

 #include "ui/gfx/android/android_surface_control_compat.h"

 #include "ui/gfx/android/android_surface_control_compat.h"
@@ -215,7 +215,7 @@ diff --git a/gpu/ipc/service/gpu_init.cc b/gpu/ipc/service/gpu_init.cc 
 #endif

 #endif

 

 

 #if BUILDFLAG(ENABLE_VULKAN)

 #if BUILDFLAG(ENABLE_VULKAN)

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

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

   }

   }

 #endif  // BUILDFLAG(IS_WIN)

 #endif  // BUILDFLAG(IS_WIN)

build/cromite_patches/Add-AllowUserCertificates-flag.patch

+12 −12
Original line number Original line Diff line number Diff line
@@ -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.PrintManagerDelegateImpl;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingController;

 import org.chromium.printing.PrintingControllerImpl;

 import org.chromium.printing.PrintingControllerImpl;

@@ -963,6 +964,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

@@ -968,6 +969,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

         super.onStartWithNative();

         super.onStartWithNative();

 

 

         ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());

         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

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

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

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

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

     &feed::kFeedPerformanceStudy,

     &feed::kFeedPerformanceStudy,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedShowSignInCommand,

     &feed::kFeedSignedOutViewDemotion,

     &feed::kFeedSignedOutViewDemotion,
@@ -51,15 +51,15 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
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

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

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

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

 

     // Feature names.

     // Feature names.

     /* Alphabetical: */

     /* Alphabetical: */

     public static final String ACT_USER_BYPASS_UX = "ActUserBypassUx";

+    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";

+    public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =

@@ -616,6 +617,8 @@ public abstract class ChromeFeatureList {

@@ -624,6 +625,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =

     public static final CachedFlag sAndroidTabDeclutterDedupeTabIdsKillSwitch =

             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);

             newCachedFlag(ANDROID_TAB_DECLUTTER_DEDUPE_TAB_IDS_KILL_SWITCH, true);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);

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

     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);

     public static final CachedFlag sBlockIntentsWhileLocked =

     public static final CachedFlag sBlockIntentsWhileLocked =

@@ -832,6 +835,7 @@ public abstract class ChromeFeatureList {

@@ -845,6 +848,7 @@ public abstract class ChromeFeatureList {

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

     public static final List<CachedFlag> sFlagsCachedFullBrowserChromium =

             List.of(

             List.of(

                     sAndroidAppIntegration,

                     sAndroidAppIntegration,

+                    sAllowUserCertificates,

+                    sAllowUserCertificates,

                     sAndroidAppIntegrationModule,

                     sAndroidAppIntegrationModule,

                     sAndroidAppIntegrationV2,

                     sAndroidAppIntegrationV2,

                     sNewTabPageCustomization,

                     sAndroidAppIntegrationWithFavicon,

diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc

diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc

new file mode 100644

new file mode 100644

--- /dev/null

--- /dev/null
@@ -111,19 +111,19 @@ new file mode 100644 
diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java

diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java

--- a/net/android/java/src/org/chromium/net/X509Util.java

--- a/net/android/java/src/org/chromium/net/X509Util.java

+++ b/net/android/java/src/org/chromium/net/X509Util.java

+++ b/net/android/java/src/org/chromium/net/X509Util.java

@@ -528,6 +528,8 @@ public class X509Util {

@@ -542,6 +542,8 @@ public class X509Util {

         return userRootBytes.toArray(new byte[0][]);

         return userRootBytes.toArray(new byte[0][]);

     }

     }

 

 

+    public static boolean AllowUserCertificates = false;

+    public static boolean AllowUserCertificates = false;

+

+

     public static AndroidCertVerifyResult verifyServerCertificates(

     public static AndroidCertVerifyResult verifyServerCertificates(

             byte[][] certChain, String authType, String host)

             byte[][] certChain,

             throws KeyStoreException, NoSuchAlgorithmException {

             String authType,

@@ -616,6 +618,9 @@ public class X509Util {

@@ -642,6 +644,9 @@ public class X509Util {

                 X509Certificate root = verifiedChain.get(verifiedChain.size() - 1);

                 isIssuedByKnownRoot = isKnownRoot(root);

                 isIssuedByKnownRoot = isKnownRoot(root);

             }

             }

 

+            if (AllowUserCertificates == false && isIssuedByKnownRoot == false)

+            if (AllowUserCertificates == false && isIssuedByKnownRoot == false)

+                return new AndroidCertVerifyResult(CertVerifyStatusAndroid.NO_TRUSTED_ROOT);

+                return new AndroidCertVerifyResult(CertVerifyStatusAndroid.NO_TRUSTED_ROOT);

+

+

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

+14 −14
Original line number Original line Diff line number Diff line
@@ -77,7 +77,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

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

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

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

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

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

     private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";

     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_SYNC_AND_SERVICES_LINK = "sync_and_services_link";

     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";

     private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -99,7 +99,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc 
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd

diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd

--- a/chrome/browser/browser_resources.grd

--- a/chrome/browser/browser_resources.grd

+++ b/chrome/browser/browser_resources.grd

+++ b/chrome/browser/browser_resources.grd

@@ -231,6 +231,9 @@

@@ -221,6 +221,9 @@

         <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />

         <include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />

         <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_list_file}" use_base_dir="false" type="BINDATA" />

         <include name="IDR_ADDITIONAL_MODULE_IDS" file="${additional_modules_list_file}" use_base_dir="false" type="BINDATA" />

       </if>

       </if>
@@ -140,9 +140,9 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr 
+#include "components/prefs/pref_service.h"

+#include "components/prefs/pref_service.h"

+#include "components/prefs/pref_registry_simple.h"

+#include "components/prefs/pref_registry_simple.h"

 

 

 #if BUILDFLAG(IS_CHROMEOS_ASH)

 #if BUILDFLAG(IS_CHROMEOS)

 #include "chromeos/ash/components/network/proxy/proxy_config_service_impl.h"

 #include "chromeos/ash/components/network/proxy/proxy_config_service_impl.h"

@@ -70,7 +74,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(

@@ -57,7 +61,20 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(

   return std::make_unique<ash::ProxyConfigServiceImpl>(

   return std::make_unique<ash::ProxyConfigServiceImpl>(

       profile_prefs, local_state_prefs, nullptr);

       profile_prefs, local_state_prefs, nullptr);

 #else

 #else
@@ -161,12 +161,12 @@ diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/pr 
+    local_state_prefs->CommitPendingWrite();

+    local_state_prefs->CommitPendingWrite();

+  }

+  }

+  return std::make_unique<PrefProxyConfigTrackerImpl>(local_state_prefs, nullptr);

+  return std::make_unique<PrefProxyConfigTrackerImpl>(local_state_prefs, nullptr);

 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)

 #endif  // BUILDFLAG(IS_CHROMEOS)

 }

 }

 

 

@@ -86,3 +103,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(

@@ -73,3 +90,8 @@ ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(

                                                       nullptr);

                                                       nullptr);

 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)

 #endif  // BUILDFLAG(IS_CHROMEOS)

 }

 }

+

+

+// static

+// static
@@ -196,7 +196,7 @@ diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/pro 
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

--- a/chrome/browser/prefs/browser_prefs.cc

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -198,6 +198,8 @@

@@ -200,6 +200,8 @@

 #include "printing/buildflags/buildflags.h"

 #include "printing/buildflags/buildflags.h"

 #include "rlz/buildflags/buildflags.h"

 #include "rlz/buildflags/buildflags.h"
@@ -205,7 +205,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse 
 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)

 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)

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

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

 #endif

 #endif

@@ -1714,6 +1716,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

@@ -1644,6 +1646,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {

   component_updater::RegisterPrefs(registry);

   component_updater::RegisterPrefs(registry);

   domain_reliability::RegisterPrefs(registry);

   domain_reliability::RegisterPrefs(registry);

   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);

   embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -217,7 +217,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse 
diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc

diff --git a/chrome/browser/prefs/chrome_command_line_pref_store.cc b/chrome/browser/prefs/chrome_command_line_pref_store.cc

--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc

--- a/chrome/browser/prefs/chrome_command_line_pref_store.cc

+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc

+++ b/chrome/browser/prefs/chrome_command_line_pref_store.cc

@@ -156,7 +156,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {

@@ -157,7 +157,7 @@ void ChromeCommandLinePrefStore::ApplyProxyMode() {

         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);

         command_line()->GetSwitchValueASCII(switches::kProxyBypassList);

     SetValue(proxy_config::prefs::kProxy,

     SetValue(proxy_config::prefs::kProxy,

              base::Value(ProxyConfigDictionary::CreateFixedServers(

              base::Value(ProxyConfigDictionary::CreateFixedServers(
@@ -660,7 +660,7 @@ new file mode 100644 
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn

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

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

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

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

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

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

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

     "webui/metrics_internals/metrics_internals_ui.h",

     "webui/metrics_internals/metrics_internals_ui.h",

     "webui/net_export_ui.cc",

     "webui/net_export_ui.cc",

     "webui/net_export_ui.h",

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

 #if BUILDFLAG(ENABLE_NACL)

 #include "chrome/browser/ui/webui/nacl_ui.h"

 #include "chrome/browser/ui/webui/nacl_ui.h"

 #endif

 #endif

@@ -401,4 +404,5 @@ void RegisterChromeWebUIConfigs() {

@@ -388,4 +391,5 @@ void RegisterChromeWebUIConfigs() {

 #if BUILDFLAG(ENABLE_GLIC)

 #if BUILDFLAG(ENABLE_GLIC)

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

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

 #endif

 #endif
@@ -1150,7 +1150,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons 
diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h

diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h

--- a/chrome/common/webui_url_constants.h

--- a/chrome/common/webui_url_constants.h

+++ b/chrome/common/webui_url_constants.h

+++ b/chrome/common/webui_url_constants.h

@@ -159,6 +159,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export";

@@ -160,6 +160,8 @@ inline constexpr char kChromeUINetExportHost[] = "net-export";

 inline constexpr char kChromeUINetInternalsHost[] = "net-internals";

 inline constexpr char kChromeUINetInternalsHost[] = "net-internals";

 inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";

 inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";

 inline constexpr char kChromeUINewTabHost[] = "newtab";

 inline constexpr char kChromeUINewTabHost[] = "newtab";
@@ -1316,7 +1316,7 @@ diff --git a/components/proxy_config/proxy_config_dictionary.h b/components/prox 
diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc

diff --git a/components/proxy_config/proxy_policy_handler.cc b/components/proxy_config/proxy_policy_handler.cc

--- a/components/proxy_config/proxy_policy_handler.cc

--- a/components/proxy_config/proxy_policy_handler.cc

+++ b/components/proxy_config/proxy_policy_handler.cc

+++ b/components/proxy_config/proxy_policy_handler.cc

@@ -380,7 +380,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,

@@ -378,7 +378,7 @@ void ProxyPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,

         set_proxy_pref_value(ProxyConfigDictionary::CreateFixedServers(

         set_proxy_pref_value(ProxyConfigDictionary::CreateFixedServers(

             server->GetString(), bypass_list && bypass_list->is_string()

             server->GetString(), bypass_list && bypass_list->is_string()

                                      ? bypass_list->GetString()

                                      ? bypass_list->GetString()

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

+65 −65

File changed.

Preview size limit exceeded, changes collapsed.