| Index: chrome/browser/ui/fullscreen/fullscreen_controller.cc
|
| diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.cc b/chrome/browser/ui/fullscreen/fullscreen_controller.cc
|
| index 5f9ab4e8748d8a81aa95639eb3a024aebbba0f8e..b0d777360890ffe876d0fd8342ebde1354f13f55 100644
|
| --- a/chrome/browser/ui/fullscreen/fullscreen_controller.cc
|
| +++ b/chrome/browser/ui/fullscreen/fullscreen_controller.cc
|
| @@ -386,11 +386,14 @@ GURL FullscreenController::GetFullscreenExitBubbleURL() const {
|
|
|
| FullscreenExitBubbleType FullscreenController::GetFullscreenExitBubbleType()
|
| const {
|
| - // In kiosk mode we always want to be fullscreen and do not want to show
|
| - // exit instructions for browser mode fullscreen.
|
| - bool kiosk = false;
|
| + // In kiosk and exclusive app mode we always want to be fullscreen and do not
|
| + // want to show exit instructions for browser mode fullscreen.
|
| + bool app_mode = false;
|
| #if !defined(OS_MACOSX) // Kiosk mode not available on Mac.
|
| - kiosk = CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
|
| + CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + app_mode = command_line->HasSwitch(switches::kKioskMode) ||
|
| + (command_line->HasSwitch(switches::kForceAppMode) &&
|
| + command_line->HasSwitch(switches::kAppId));
|
| #endif
|
|
|
| if (mouse_lock_state_ == MOUSELOCK_ACCEPTED_SILENTLY) {
|
| @@ -421,7 +424,7 @@ FullscreenExitBubbleType FullscreenController::GetFullscreenExitBubbleType()
|
| } else {
|
| if (!extension_caused_fullscreen_.is_empty()) {
|
| return FEB_TYPE_BROWSER_EXTENSION_FULLSCREEN_EXIT_INSTRUCTION;
|
| - } else if (toggled_into_fullscreen_ && !kiosk) {
|
| + } else if (toggled_into_fullscreen_ && !app_mode) {
|
| return FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION;
|
| } else {
|
| return FEB_TYPE_NONE;
|
| @@ -504,8 +507,11 @@ void FullscreenController::ToggleFullscreenModeInternal(bool for_tab) {
|
|
|
| // In kiosk mode, we always want to be fullscreen. When the browser first
|
| // starts we're not yet fullscreen, so let the initial toggle go through.
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) &&
|
| - !toggled_into_fullscreen_)
|
| + CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + bool app_mode = command_line->HasSwitch(switches::kKioskMode) ||
|
| + (command_line->HasSwitch(switches::kForceAppMode) &&
|
| + command_line->HasSwitch(switches::kAppId));
|
| + if (app_mode && !toggled_into_fullscreen_)
|
| return;
|
|
|
| GURL url;
|
|
|