Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Side by Side Diff: ash/common/wm/maximize_mode/maximize_mode_event_handler.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" 5 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
6 6
7 #include "ash/common/session/session_state_delegate.h" 7 #include "ash/common/session/session_controller.h"
8 #include "ash/common/system/tray/system_tray_delegate.h" 8 #include "ash/common/system/tray/system_tray_delegate.h"
9 #include "ash/common/wm/window_state.h" 9 #include "ash/common/wm/window_state.h"
10 #include "ash/common/wm/wm_event.h" 10 #include "ash/common/wm/wm_event.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/common/wm_window.h" 12 #include "ash/common/wm_window.h"
13 #include "ui/events/event.h" 13 #include "ui/events/event.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace wm { 16 namespace wm {
17 namespace { 17 namespace {
18 18
19 // The height of the area in which a touch operation leads to exiting the 19 // The height of the area in which a touch operation leads to exiting the
20 // full screen mode. 20 // full screen mode.
21 const int kLeaveFullScreenAreaHeightInPixel = 2; 21 const int kLeaveFullScreenAreaHeightInPixel = 2;
22 22
23 } // namespace 23 } // namespace
24 24
25 MaximizeModeEventHandler::MaximizeModeEventHandler() {} 25 MaximizeModeEventHandler::MaximizeModeEventHandler() {}
26 26
27 MaximizeModeEventHandler::~MaximizeModeEventHandler() {} 27 MaximizeModeEventHandler::~MaximizeModeEventHandler() {}
28 28
29 bool MaximizeModeEventHandler::ToggleFullscreen(const ui::TouchEvent& event) { 29 bool MaximizeModeEventHandler::ToggleFullscreen(const ui::TouchEvent& event) {
30 if (event.type() != ui::ET_TOUCH_PRESSED) 30 if (event.type() != ui::ET_TOUCH_PRESSED)
31 return false; 31 return false;
32 32
33 const SessionStateDelegate* delegate = 33 const SessionController* controller = WmShell::Get()->session_controller();
34 WmShell::Get()->GetSessionStateDelegate();
35 34
36 if (delegate->IsScreenLocked() || 35 if (controller->IsScreenLocked() ||
37 delegate->GetSessionState() != session_manager::SessionState::ACTIVE) { 36 controller->GetSessionState() != session_manager::SessionState::ACTIVE) {
38 return false; 37 return false;
39 } 38 }
40 39
41 // Find the active window (from the primary screen) to un-fullscreen. 40 // Find the active window (from the primary screen) to un-fullscreen.
42 WmWindow* window = WmShell::Get()->GetActiveWindow(); 41 WmWindow* window = WmShell::Get()->GetActiveWindow();
43 if (!window) 42 if (!window)
44 return false; 43 return false;
45 44
46 WindowState* window_state = window->GetWindowState(); 45 WindowState* window_state = window->GetWindowState();
47 if (!window_state->IsFullscreen() || window_state->in_immersive_fullscreen()) 46 if (!window_state->IsFullscreen() || window_state->in_immersive_fullscreen())
(...skipping 15 matching lines...) Expand all
63 return false; 62 return false;
64 } 63 }
65 64
66 WMEvent toggle_fullscreen(WM_EVENT_TOGGLE_FULLSCREEN); 65 WMEvent toggle_fullscreen(WM_EVENT_TOGGLE_FULLSCREEN);
67 window->GetWindowState()->OnWMEvent(&toggle_fullscreen); 66 window->GetWindowState()->OnWMEvent(&toggle_fullscreen);
68 return true; 67 return true;
69 } 68 }
70 69
71 } // namespace wm 70 } // namespace wm
72 } // namespace ash 71 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698