Merge pull request #36 from uazo/create-pull-request/patch-63cf10b

changes for 108.0.5359.72
This commit is contained in:
uazo
2022-12-02 23:44:27 +08:00
committed by GitHub
3 changed files with 4 additions and 77 deletions
@@ -1,21 +0,0 @@
From: Your Name <you@example.com>
Date: Mon, 7 Nov 2022 16:49:08 +0000
Subject: Client hints overrides (add fixup)
---
components/optimization_guide/core/hints_manager.cc | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/optimization_guide/core/hints_manager.cc b/components/optimization_guide/core/hints_manager.cc
--- a/components/optimization_guide/core/hints_manager.cc
+++ b/components/optimization_guide/core/hints_manager.cc
@@ -1057,6 +1057,7 @@ void HintsManager::CanApplyOptimizationOnDemand(
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
// TODO(crbug/1275612): Check whether we have consent to fetch.
+ if ((true)) return; // no consent on bromite
// This set contains URLs that require some information to be fetched, whether
// that be a URL-keyed hint or a host-keyed hint.
--
2.25.1
+4 -4
View File
@@ -161520,7 +161520,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
-->
<!--
@@ -33995,6 +33998,12 @@ Called by update_extension_histograms.py.-->
@@ -33998,6 +34001,12 @@ Called by update_extension_histograms.py.-->
<int value="496" label="INPUT_METHOD_PRIVATE_ON_CARET_BOUNDS_CHANGED"/>
<int value="497" label="PASSWORDS_PRIVATE_ON_PASSWORD_MANAGER_AUTH_TIMEOUT"/>
<int value="498" label="PASSWORDS_PRIVATE_ON_INSECURE_CREDENTIALS_CHANGED"/>
@@ -161533,7 +161533,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
</enum>
<enum name="ExtensionFileWriteResult">
@@ -35802,6 +35811,31 @@ Called by update_extension_histograms.py.-->
@@ -35805,6 +35814,31 @@ Called by update_extension_histograms.py.-->
<int value="1723" label="AUTOTESTPRIVATE_REMOVEFUSEBOXTEMPDIR"/>
<int value="1724" label="AUTOTESTPRIVATE_GETTHROUGHPUTTRACKERDATA"/>
<int value="1725" label="ENTERPRISE_REMOTEAPPS_SORTLAUNCHER"/>
@@ -161565,7 +161565,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
</enum>
<enum name="ExtensionIconState">
@@ -36436,6 +36470,7 @@ Called by update_extension_permission.py.-->
@@ -36439,6 +36473,7 @@ Called by update_extension_permission.py.-->
<int value="242" label="kDownloadsUi"/>
<int value="243" label="kWebRequestAuthProvider"/>
<int value="244" label="kChromeOSTelemetryNetworkInformation"/>
@@ -161573,7 +161573,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
</enum>
<enum name="ExtensionPointEnableState">
@@ -97869,6 +97904,8 @@ Full version information for the fingerprint enum values:
@@ -97872,6 +97907,8 @@ Full version information for the fingerprint enum values:
<int value="29" label="kMediaStorageIdSalt"/>
<int value="30" label="kModuleBlocklistCacheMD5Digest"/>
<int value="32" label="kMediaCdmOriginData"/>
@@ -1,52 +0,0 @@
From: Your Name <you@example.com>
Date: Mon, 7 Nov 2022 16:09:55 +0000
Subject: Move navigation bar to bottom (add fixup)
---
.../browser/ui/system/StatusBarColorController.java | 9 +++++++++
.../org/chromium/chrome/browser/ui/appmenu/AppMenu.java | 5 +++++
2 files changed, 14 insertions(+)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java
@@ -13,6 +13,9 @@ import android.view.Window;
import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.flags.CachedFeatureFlags;
+
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.base.CallbackController;
import org.chromium.base.supplier.ObservableSupplier;
@@ -370,6 +373,12 @@ public class StatusBarColorController
boolean needsDarkStatusBarIcons = !ColorUtils.shouldUseLightForegroundOnBackground(color);
ApiCompatibilityUtils.setStatusBarIconColor(root, needsDarkStatusBarIcons);
ApiCompatibilityUtils.setStatusBarColor(mWindow, color);
+ if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM) &&
+ Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ UiUtils.setNavigationBarIconColor(mWindow.getDecorView().getRootView(),
+ needsDarkStatusBarIcons);
+ mWindow.setNavigationBarColor(color);
+ }
}
/**
diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
--- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
+++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
@@ -310,6 +310,11 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler
if (popupHeight + popupPosition[1] > visibleDisplayFrame.bottom) {
mPopup.setHeight(visibleDisplayFrame.height());
}
+ if (CachedFeatureFlags.isEnabled(ChromeFeatureList.MOVE_TOP_TOOLBAR_TO_BOTTOM)) {
+ // due to some unknown behaviour, the popup must be resized to
+ // allow selection without leaving touch
+ mPopup.setHeight(popupHeight-1);
+ }
try {
mPopup.showAtLocation(anchorView.getRootView(), Gravity.NO_GRAVITY, popupPosition[0],
--
2.25.1