Skip to content

Commit

Permalink
chore: bump chromium to 106.0.5249.40 (21-x-y) (#35686)
Browse files Browse the repository at this point in the history
* chore: bump chromium in DEPS to 106.0.5249.40

* chore: update patches

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
  • Loading branch information
electron-roller[bot] and patchup[bot] committed Sep 15, 2022
1 parent cbf5843 commit 5e7ff85
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

vars = {
'chromium_version':
'106.0.5249.30',
'106.0.5249.40',
'node_version':
'v16.16.0',
'nan_version':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Linux or Windows to un-fullscreen in some circumstances without this
change.

diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff118eed07 100644
index 8106b5ceec5b6b3ca01d14308a351e63eac809c1..5758757980879a9c1810c4de44f228860688d442 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
@@ -17,12 +17,16 @@
Expand All @@ -36,23 +36,23 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
#include "chrome/common/chrome_switches.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/navigation_entry.h"
@@ -177,6 +181,7 @@ void FullscreenController::EnterFullscreenModeForTab(
@@ -181,6 +185,7 @@ void FullscreenController::EnterFullscreenModeForTab(
return;
}

+#if 0
if (base::FeatureList::IsEnabled(
blink::features::kWindowPlacementFullscreenCompanionWindow)) {
if (!popunder_preventer_)
@@ -184,6 +189,7 @@ void FullscreenController::EnterFullscreenModeForTab(
@@ -188,6 +193,7 @@ void FullscreenController::EnterFullscreenModeForTab(
else
popunder_preventer_->WillActivateWebContents(web_contents);
}
+#endif

// Keep the current state. |SetTabWithExclusiveAccess| may change the return
// value of |IsWindowFullscreenForTabOrPending|.
@@ -233,7 +239,9 @@ void FullscreenController::EnterFullscreenModeForTab(
@@ -237,7 +243,9 @@ void FullscreenController::EnterFullscreenModeForTab(
}

void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
Expand All @@ -62,7 +62,7 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff

if (MaybeToggleFullscreenWithinTab(web_contents, false)) {
// During tab capture of fullscreen-within-tab views, the browser window
@@ -288,11 +296,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
@@ -292,11 +300,13 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
void FullscreenController::FullscreenTabOpeningPopup(
content::WebContents* opener,
content::WebContents* popup) {
Expand All @@ -76,7 +76,7 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
}

void FullscreenController::OnTabDeactivated(
@@ -460,18 +470,17 @@ void FullscreenController::EnterFullscreenModeInternal(
@@ -465,18 +475,17 @@ void FullscreenController::EnterFullscreenModeInternal(
// Do not enter fullscreen mode if disallowed by pref. This prevents the user
// from manually entering fullscreen mode and also disables kiosk mode on
// desktop platforms.
Expand All @@ -100,15 +100,15 @@ index 84d9b4d72662895042e523522c13ec477aebe868..c358a34447c8aa67a341a1e4df769dff
if (option == TAB) {
url = GetRequestingOrigin();
tab_fullscreen_ = true;
@@ -498,6 +507,7 @@ void FullscreenController::EnterFullscreenModeInternal(
@@ -509,6 +518,7 @@ void FullscreenController::EnterFullscreenModeInternal(
if (!extension_caused_fullscreen_.is_empty())
url = extension_caused_fullscreen_;
}
+#endif

if (option == BROWSER)
base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));
@@ -525,12 +535,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
@@ -536,12 +546,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
RecordExitingUMA();
toggled_into_fullscreen_ = false;
started_fullscreen_transition_ = true;
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/mas_disable_remote_accessibility.patch
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ index d460e055c8bc70845cdf89567e17a79da70fd9f1..f28dcfe0721239ca9341a0db80e8626a

///////////////////////////////////////////////////////////////////////////////
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 012ab83bb9f4887646decb030b4a18f6b21e0d01..0d8b56cc387b24833ec7950a8049e038f650020c 100644
index 8efef6d9adbca21613be3c32fe9f43b2d50ff8c5..6e819be94a6a5e8a26598f4883697719fecef693 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -341,6 +341,13 @@ component("base") {
Expand Down

0 comments on commit 5e7ff85

Please sign in to comment.