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

Side by Side Diff: ash/system/chromeos/power/tablet_power_button_controller.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/system/chromeos/power/tablet_power_button_controller.h" 5 #include "ash/system/chromeos/power/tablet_power_button_controller.h"
6 6
7 #include "ash/common/accessibility_delegate.h" 7 #include "ash/common/accessibility_delegate.h"
8 #include "ash/common/session/session_state_delegate.h" 8 #include "ash/common/session/session_controller.h"
9 #include "ash/common/shell_delegate.h" 9 #include "ash/common/shell_delegate.h"
10 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 10 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/wm/lock_state_controller.h" 13 #include "ash/wm/lock_state_controller.h"
14 #include "base/time/default_tick_clock.h" 14 #include "base/time/default_tick_clock.h"
15 #include "chromeos/dbus/dbus_thread_manager.h" 15 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "ui/events/devices/input_device_manager.h" 16 #include "ui/events/devices/input_device_manager.h"
17 #include "ui/events/devices/stylus_state.h" 17 #include "ui/events/devices/stylus_state.h"
18 #include "ui/events/event.h" 18 #include "ui/events/event.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 : kShutdownWhenScreenOnTimeoutMs); 245 : kShutdownWhenScreenOnTimeoutMs);
246 shutdown_timer_.Start(FROM_HERE, timeout, this, 246 shutdown_timer_.Start(FROM_HERE, timeout, this,
247 &TabletPowerButtonController::OnShutdownTimeout); 247 &TabletPowerButtonController::OnShutdownTimeout);
248 } 248 }
249 249
250 void TabletPowerButtonController::OnShutdownTimeout() { 250 void TabletPowerButtonController::OnShutdownTimeout() {
251 controller_->StartShutdownAnimation(); 251 controller_->StartShutdownAnimation();
252 } 252 }
253 253
254 void TabletPowerButtonController::LockScreenIfRequired() { 254 void TabletPowerButtonController::LockScreenIfRequired() {
255 SessionStateDelegate* session_state_delegate = 255 SessionController* session_controller = WmShell::Get()->session_controller();
256 WmShell::Get()->GetSessionStateDelegate(); 256 if (session_controller->ShouldLockScreenAutomatically() &&
257 if (session_state_delegate->ShouldLockScreenAutomatically() && 257 session_controller->CanLockScreen() &&
258 session_state_delegate->CanLockScreen() && 258 !session_controller->IsUserSessionBlocked() &&
259 !session_state_delegate->IsUserSessionBlocked() &&
260 !controller_->LockRequested()) { 259 !controller_->LockRequested()) {
261 session_state_delegate->LockScreen(); 260 session_controller->LockScreen();
262 } 261 }
263 } 262 }
264 263
265 } // namespace ash 264 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698