summaryrefslogtreecommitdiffstats
path: root/chromium/chrome/browser/extensions/api/tabs/tabs_util_chromeos.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-06-27 11:18:24 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-03 09:38:30 +0000
commitd94af01c90575348c4e81a418257f254b6f8d225 (patch)
tree77a26669b33eaa4d46b88b07e17dacc61eba6001 /chromium/chrome/browser/extensions/api/tabs/tabs_util_chromeos.cc
parent5d87695f37678f96492b258bbab36486c59866b4 (diff)
BASELINE: Update Chromium to 75.0.3770.116
Change-Id: Ifcd5227841577e8ce81a1b7a54c56caba4d85e02 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/tabs/tabs_util_chromeos.cc')
-rw-r--r--chromium/chrome/browser/extensions/api/tabs/tabs_util_chromeos.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chromium/chrome/browser/extensions/api/tabs/tabs_util_chromeos.cc b/chromium/chrome/browser/extensions/api/tabs/tabs_util_chromeos.cc
index d09e42c33d2..0d37fecd99d 100644
--- a/chromium/chrome/browser/extensions/api/tabs/tabs_util_chromeos.cc
+++ b/chromium/chrome/browser/extensions/api/tabs/tabs_util_chromeos.cc
@@ -7,6 +7,7 @@
#include "ash/public/cpp/window_properties.h"
#include "ash/public/interfaces/window_pin_type.mojom.h"
#include "base/metrics/histogram_macros.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/ui/ash/chrome_screenshot_grabber.h"
@@ -25,6 +26,14 @@ namespace tabs_util {
void SetLockedFullscreenState(Browser* browser, bool locked) {
UMA_HISTOGRAM_BOOLEAN("Extensions.LockedFullscreenStateRequest", locked);
+ // Disable ChromeVox before entering locked fullscreen. Quickfix for
+ // crbug.com/957950.
+ auto* const accessibility_manager = chromeos::AccessibilityManager::Get();
+ if (locked && accessibility_manager &&
+ accessibility_manager->IsSpokenFeedbackEnabled()) {
+ accessibility_manager->EnableSpokenFeedback(false);
+ }
+
aura::Window* window = browser->window()->GetNativeWindow();
// TRUSTED_PINNED is used here because that one locks the window fullscreen
// without allowing the user to exit (as opposed to regular PINNED).