| Index: ash/wm/maximize_mode/maximize_mode_event_handler.cc
|
| diff --git a/ash/wm/maximize_mode/maximize_mode_event_handler.cc b/ash/wm/maximize_mode/maximize_mode_event_handler.cc
|
| index 7f93103845f10703dd9ba2117ca9c461aba3983f..0a38ac89c492ec95d7ba65c5d7ccaa22a77bc32f 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_event_handler.cc
|
| +++ b/ash/wm/maximize_mode/maximize_mode_event_handler.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "ash/session/session_controller.h"
|
| #include "ash/shell.h"
|
| -#include "ash/system/tray/system_tray_delegate.h"
|
| #include "ash/wm/window_state.h"
|
| #include "ash/wm/window_util.h"
|
| #include "ash/wm/wm_event.h"
|
| @@ -55,13 +54,8 @@ bool MaximizeModeEventHandler::ToggleFullscreen(const ui::TouchEvent& event) {
|
| }
|
|
|
| // Do not exit fullscreen in kiosk mode.
|
| - SystemTrayDelegate* system_tray_delegate =
|
| - Shell::Get()->system_tray_delegate();
|
| - if (system_tray_delegate->GetUserLoginStatus() == LoginStatus::KIOSK_APP ||
|
| - system_tray_delegate->GetUserLoginStatus() ==
|
| - LoginStatus::ARC_KIOSK_APP) {
|
| + if (Shell::Get()->session_controller()->IsKioskSession())
|
| return false;
|
| - }
|
|
|
| WMEvent toggle_fullscreen(WM_EVENT_TOGGLE_FULLSCREEN);
|
| window->GetWindowState()->OnWMEvent(&toggle_fullscreen);
|
|
|