| 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 fa0f593c3ede61a727b0f844f837c9f3370f21fa..95f0d40ea09f9fbcb43b350fadbdba96db594f98 100644
|
| --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
| +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
| @@ -436,7 +436,8 @@ void FullscreenController::ToggleFullscreenModeInternal(
|
| // FullscreenWithoutChrome and FullscreenWithToolbar.
|
| if (exclusive_access_context->IsFullscreen() &&
|
| !IsWindowFullscreenForTabOrPending() &&
|
| - exclusive_access_context->SupportsFullscreenWithToolbar()) {
|
| + exclusive_access_context->SupportsFullscreenWithToolbar() &&
|
| + IsExtensionFullscreenOrPending()) {
|
| if (option == BROWSER_WITH_TOOLBAR) {
|
| enter_fullscreen = enter_fullscreen ||
|
| !exclusive_access_context->IsFullscreenWithToolbar();
|
|
|