123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Shelley Vohr <[email protected]>
- Date: Mon, 25 Oct 2021 21:45:57 +0200
- Subject: fix: adapt exclusive_access for electron needs
- This patch is necessary in order to properly enable
- navigator.keyboard.{(un)?lock}() functionality. We don't have a concept
- of PermissionManager nor of a Profile, so this would not affect usage of
- the API.
- We also need to ensure that NotifyExclusiveTabAccessLost is called
- on all platforms in FullscreenController::ExitFullscreenModeInternal()
- and not just macOS, since Electron's native window impls report state
- change fairly instantly as well, and so pressing escape won't work on
- 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 4bac72a51952764c72679ad3b991f2828ef308f4..785f8f166620cc71ca3e464110ff29b8e47c91b8 100644
- --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
- +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
- @@ -15,12 +15,16 @@
- #include "build/build_config.h"
- #include "chrome/browser/app_mode/app_mode_utils.h"
- #include "chrome/browser/profiles/profile.h"
- +#if 0
- #include "chrome/browser/ui/blocked_content/popunder_preventer.h"
- +#endif
- #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
- #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
- #include "chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h"
- +#if 0
- #include "chrome/browser/ui/status_bubble.h"
- #include "chrome/browser/ui/tabs/tab_strip_model.h"
- +#endif
- #include "chrome/common/chrome_switches.h"
- #include "content/public/browser/fullscreen_types.h"
- #include "content/public/browser/navigation_details.h"
- @@ -176,10 +180,12 @@ void FullscreenController::EnterFullscreenModeForTab(
- return;
- }
-
- +#if 0
- if (!popunder_preventer_)
- popunder_preventer_ = std::make_unique<PopunderPreventer>(web_contents);
- else
- popunder_preventer_->WillActivateWebContents(web_contents);
- +#endif
-
- // Keep the current state. |SetTabWithExclusiveAccess| may change the return
- // value of |IsWindowFullscreenForTabOrPending|.
- @@ -229,11 +235,13 @@ void FullscreenController::EnterFullscreenModeForTab(
- }
-
- void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
- +#if 0
- // Reset the popunder preventer after the window exits content fullscreen.
- // This activates any popup windows that were created while fullscreen.
- base::ScopedClosureRunner reset_popunder_preventer(
- base::BindOnce(&std::unique_ptr<PopunderPreventer>::reset,
- base::Unretained(&popunder_preventer_), nullptr));
- +#endif
-
- if (MaybeToggleFullscreenWithinTab(web_contents, false)) {
- // During tab capture of fullscreen-within-tab views, the browser window
- @@ -291,12 +299,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
- void FullscreenController::FullscreenTabOpeningPopup(
- content::WebContents* opener,
- content::WebContents* popup) {
- +#if 0
- if (popunder_preventer_) {
- DCHECK_EQ(exclusive_access_tab(), opener);
- popunder_preventer_->AddPotentialPopunder(popup);
- } else {
- DCHECK(IsFullscreenWithinTab(opener));
- }
- +#endif
- }
-
- void FullscreenController::OnTabDeactivated(
- @@ -466,18 +476,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.
- - if (!exclusive_access_manager()
- - ->context()
- - ->GetProfile()
- - ->GetPrefs()
- - ->GetBoolean(prefs::kFullscreenAllowed)) {
- + auto* profile = exclusive_access_manager()->context()->GetProfile();
- + if (!profile || !profile->GetPrefs()->GetBoolean(prefs::kFullscreenAllowed))
- return;
- - }
- #endif
- started_fullscreen_transition_ = true;
- toggled_into_fullscreen_ = true;
- +#if 0
- bool entering_tab_fullscreen = option == TAB && !tab_fullscreen_;
- +#endif
- GURL url;
- +#if 0
- if (option == TAB) {
- url = GetRequestingOrigin();
- tab_fullscreen_ = true;
- @@ -510,6 +519,7 @@ void FullscreenController::EnterFullscreenModeInternal(
- if (!extension_caused_fullscreen_.is_empty())
- url = extension_caused_fullscreen_;
- }
- +#endif
-
- if (option == BROWSER)
- base::RecordAction(base::UserMetricsAction("ToggleFullscreen"));
- @@ -530,12 +540,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
-
- toggled_into_fullscreen_ = false;
- started_fullscreen_transition_ = true;
- -#if BUILDFLAG(IS_MAC)
- - // Mac windows report a state change instantly, and so we must also clear
- +
- + // Electron native windows report a state change instantly, and so we must also clear
- // state_prior_to_tab_fullscreen_ to match them else other logic using
- // state_prior_to_tab_fullscreen_ will be incorrect.
- NotifyTabExclusiveAccessLost();
- -#endif
- +
- exclusive_access_manager()->context()->ExitFullscreen();
- extension_caused_fullscreen_ = GURL();
-
- diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
- index 8e78c52e83e6fc96e97d45970cff12b062d63ad8..6c9c4b439101ca4870c1d682e1b899fb82f836a8 100644
- --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
- +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
- @@ -243,10 +243,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
- // Used in testing to set the state to tab fullscreen.
- bool is_tab_fullscreen_for_testing_ = false;
-
- +#if 0
- // Tracks related popups that lost activation or were shown without activation
- // during content fullscreen sessions. This also activates the popups when
- // fullscreen exits, to prevent sites from creating persisent popunders.
- std::unique_ptr<PopunderPreventer> popunder_preventer_;
- +#endif
-
- base::ObserverList<FullscreenObserver> observer_list_;
-
|