|
@@ -16,10 +16,10 @@ 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 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a3ac6a930 100644
|
|
|
+index 5136dd14692d31fc0b12adf0e026c99168db4da5..3e32e68cb017c11bba84278681fac7902f378527 100644
|
|
|
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
|
|
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
|
|
-@@ -20,12 +20,16 @@
|
|
|
+@@ -21,12 +21,16 @@
|
|
|
#include "chrome/browser/history/history_service_factory.h"
|
|
|
#include "chrome/browser/profiles/profile.h"
|
|
|
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
|
@@ -36,7 +36,7 @@ index 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a
|
|
|
#include "chrome/common/chrome_switches.h"
|
|
|
#include "components/history/core/browser/history_service.h"
|
|
|
#include "components/history/core/browser/history_types.h"
|
|
|
-@@ -253,10 +257,12 @@ void FullscreenController::EnterFullscreenModeForTab(
|
|
|
+@@ -254,10 +258,12 @@ void FullscreenController::EnterFullscreenModeForTab(
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -49,7 +49,7 @@ index 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a
|
|
|
|
|
|
// Keep the current state. |SetTabWithExclusiveAccess| may change the return
|
|
|
// value of |IsWindowFullscreenForTabOrPending|.
|
|
|
-@@ -368,12 +374,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
|
|
|
+@@ -369,12 +375,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
|
|
|
void FullscreenController::FullscreenTabOpeningPopup(
|
|
|
content::WebContents* opener,
|
|
|
content::WebContents* popup) {
|
|
@@ -64,7 +64,7 @@ index 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a
|
|
|
}
|
|
|
|
|
|
void FullscreenController::OnTabDeactivated(
|
|
|
-@@ -459,10 +467,12 @@ void FullscreenController::FullscreenTransitionCompleted() {
|
|
|
+@@ -460,10 +468,12 @@ void FullscreenController::FullscreenTransitionCompleted() {
|
|
|
#endif // DCHECK_IS_ON()
|
|
|
tab_fullscreen_target_display_id_ = display::kInvalidDisplayId;
|
|
|
started_fullscreen_transition_ = false;
|
|
@@ -77,7 +77,7 @@ index 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a
|
|
|
}
|
|
|
|
|
|
void FullscreenController::RunOrDeferUntilTransitionIsComplete(
|
|
|
-@@ -570,18 +580,17 @@ void FullscreenController::EnterFullscreenModeInternal(
|
|
|
+@@ -571,18 +581,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.
|
|
@@ -101,7 +101,7 @@ index 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a
|
|
|
if (option == TAB) {
|
|
|
url = GetRequestingOrigin();
|
|
|
tab_fullscreen_ = true;
|
|
|
-@@ -614,6 +623,7 @@ void FullscreenController::EnterFullscreenModeInternal(
|
|
|
+@@ -615,6 +624,7 @@ void FullscreenController::EnterFullscreenModeInternal(
|
|
|
if (!extension_caused_fullscreen_.is_empty())
|
|
|
url = extension_caused_fullscreen_;
|
|
|
}
|
|
@@ -109,7 +109,7 @@ index 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a
|
|
|
|
|
|
fullscreen_start_time_ = base::TimeTicks::Now();
|
|
|
if (option == BROWSER)
|
|
|
-@@ -633,6 +643,7 @@ void FullscreenController::ExitFullscreenModeInternal() {
|
|
|
+@@ -634,6 +644,7 @@ void FullscreenController::ExitFullscreenModeInternal() {
|
|
|
if (chrome::IsRunningInAppMode())
|
|
|
return;
|
|
|
|
|
@@ -117,7 +117,7 @@ index 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a
|
|
|
// `fullscreen_start_time_` is null if a fullscreen tab moves to a new window.
|
|
|
if (fullscreen_start_time_ && exclusive_access_tab()) {
|
|
|
ukm::SourceId source_id =
|
|
|
-@@ -644,15 +655,16 @@ void FullscreenController::ExitFullscreenModeInternal() {
|
|
|
+@@ -645,15 +656,16 @@ void FullscreenController::ExitFullscreenModeInternal() {
|
|
|
.Record(ukm::UkmRecorder::Get());
|
|
|
fullscreen_start_time_.reset();
|
|
|
}
|
|
@@ -137,7 +137,7 @@ index 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a
|
|
|
exclusive_access_manager()->context()->ExitFullscreen();
|
|
|
extension_caused_fullscreen_ = GURL();
|
|
|
exclusive_access_manager()->UpdateBubble(base::NullCallback());
|
|
|
-@@ -714,8 +726,12 @@ GURL FullscreenController::GetEmbeddingOrigin() const {
|
|
|
+@@ -715,8 +727,12 @@ GURL FullscreenController::GetEmbeddingOrigin() const {
|
|
|
void FullscreenController::RecordMetricsOnFullscreenApiRequested(
|
|
|
content::RenderFrameHost* requesting_frame) {
|
|
|
history::HistoryService* service =
|
|
@@ -151,10 +151,10 @@ index 64ba5e52bb81dc0a95c3d46579abfa63725a4c28..a91adbea3d8b0d32cb77bfea551e488a
|
|
|
// Check if the origin has been visited more than a day ago and whether it's
|
|
|
// on an allowlist, then record those bits of information in a metric.
|
|
|
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
|
|
|
-index 643d434d3fd420fb04e1ee4ef17c7d8cbab752d7..018ae803de7de01bbe5a4709460ce3906dfe8469 100644
|
|
|
+index 97003f03b69c9435ee1f79e42476003b63b8a66d..859b9d21985c14c9e9f95c65edfbd89e13ef16e7 100644
|
|
|
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h
|
|
|
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
|
|
|
-@@ -252,10 +252,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
|
|
|
+@@ -250,10 +250,12 @@ class FullscreenController : public ExclusiveAccessControllerBase {
|
|
|
// Used in testing to set the state to tab fullscreen.
|
|
|
bool is_tab_fullscreen_for_testing_ = false;
|
|
|
|