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

Side by Side Diff: ash/system/power/tablet_power_button_controller.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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/power/tablet_power_button_controller.h" 5 #include "ash/system/power/tablet_power_button_controller.h"
6 6
7 #include "ash/accessibility_delegate.h" 7 #include "ash/accessibility_delegate.h"
8 #include "ash/session/session_controller.h" 8 #include "ash/session/session_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
11 #include "ash/wm/lock_state_controller.h" 11 #include "ash/wm/lock_state_controller.h"
12 #include "ash/wm/maximize_mode/maximize_mode_controller.h" 12 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
13 #include "ash/wm_shell.h"
14 #include "base/time/default_tick_clock.h" 13 #include "base/time/default_tick_clock.h"
15 #include "chromeos/dbus/dbus_thread_manager.h" 14 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "ui/events/devices/input_device_manager.h" 15 #include "ui/events/devices/input_device_manager.h"
17 #include "ui/events/devices/stylus_state.h" 16 #include "ui/events/devices/stylus_state.h"
18 #include "ui/events/event.h" 17 #include "ui/events/event.h"
19 18
20 namespace ash { 19 namespace ash {
21 20
22 namespace { 21 namespace {
23 22
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 SessionController* session_controller = Shell::Get()->session_controller(); 254 SessionController* session_controller = Shell::Get()->session_controller();
256 if (session_controller->ShouldLockScreenAutomatically() && 255 if (session_controller->ShouldLockScreenAutomatically() &&
257 session_controller->CanLockScreen() && 256 session_controller->CanLockScreen() &&
258 !session_controller->IsUserSessionBlocked() && 257 !session_controller->IsUserSessionBlocked() &&
259 !controller_->LockRequested()) { 258 !controller_->LockRequested()) {
260 session_controller->LockScreen(); 259 session_controller->LockScreen();
261 } 260 }
262 } 261 }
263 262
264 } // namespace ash 263 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698