| Index: chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
| diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
| index fd2b2b89822ebb81e355a39e3b171fc429636da7..5ab36a952b1f32242e14c131e6a61ccbfae7ed16 100644
|
| --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
| +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
| @@ -509,6 +509,12 @@ void FullscreenController::ExitFullscreenModeInternal() {
|
| ContentSetting FullscreenController::GetFullscreenSetting() const {
|
| DCHECK(exclusive_access_tab());
|
|
|
| + // If simplified UI is enabled, never ask the user, just auto-allow.
|
| + // TODO(mgiuca): Should we allow the user to block use of fullscreen?
|
| + // http://crbug.com/515747.
|
| + if (ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
|
| + return CONTENT_SETTING_ALLOW;
|
| +
|
| GURL url = GetRequestingOrigin();
|
|
|
| // Always ask on file:// URLs, since we can't meaningfully make the
|
|
|