| Index: ash/wm/maximize_mode/maximize_mode_window_manager.cc
|
| diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.cc b/ash/wm/maximize_mode/maximize_mode_window_manager.cc
|
| index 907b0173ccd23cf9e8bee05b0eb85c54c2281871..40305bb4e4733200cbb692ef18cf401718d9586b 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_window_manager.cc
|
| +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "ash/ash_switches.h"
|
| #include "ash/root_window_controller.h"
|
| +#include "ash/session/session_state_delegate.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/wm/maximize_mode/maximize_mode_window_state.h"
|
| @@ -161,6 +162,21 @@ void MaximizeModeWindowManager::OnDisplayMetricsChanged(const gfx::Display&,
|
| }
|
|
|
| void MaximizeModeWindowManager::OnTouchEvent(ui::TouchEvent* event) {
|
| + const SessionStateDelegate* delegate =
|
| + Shell::GetInstance()->session_state_delegate();
|
| +
|
| + if (delegate->IsScreenLocked())
|
| + return;
|
| +
|
| + switch (delegate->GetSessionState()) {
|
| + case SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY:
|
| + return;
|
| + case SessionStateDelegate::SESSION_STATE_ACTIVE:
|
| + break;
|
| + case SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY:
|
| + return;
|
| + }
|
| +
|
| if (event->type() != ui::ET_TOUCH_PRESSED)
|
| return;
|
|
|
|
|