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

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

Issue 2642853006: Remove the ash-enable-touch-view-testing flag (Closed)
Patch Set: holte's comment. Created 3 years, 11 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_state_delegate.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"
(...skipping 11 matching lines...) Expand all
22 namespace { 22 namespace {
23 23
24 // Amount of time the power button must be held to start the pre-shutdown 24 // Amount of time the power button must be held to start the pre-shutdown
25 // animation when in tablet mode. 25 // animation when in tablet mode.
26 constexpr int kShutdownTimeoutMs = 500; 26 constexpr int kShutdownTimeoutMs = 500;
27 27
28 // Amount of time since last SuspendDone() that power button event needs to be 28 // Amount of time since last SuspendDone() that power button event needs to be
29 // ignored. 29 // ignored.
30 constexpr int kIgnorePowerButtonAfterResumeMs = 2000; 30 constexpr int kIgnorePowerButtonAfterResumeMs = 2000;
31 31
32 // Returns true if device is a convertible/tablet device or has 32 // Returns true if device is a convertible/tablet device, otherwise false.
33 // kAshEnableTouchViewTesting in test, otherwise false.
34 bool IsTabletModeSupported() { 33 bool IsTabletModeSupported() {
35 MaximizeModeController* maximize_mode_controller = 34 MaximizeModeController* maximize_mode_controller =
36 WmShell::Get()->maximize_mode_controller(); 35 WmShell::Get()->maximize_mode_controller();
37 return maximize_mode_controller && 36 return maximize_mode_controller &&
38 maximize_mode_controller->CanEnterMaximizeMode(); 37 maximize_mode_controller->CanEnterMaximizeMode();
39 } 38 }
40 39
41 // Returns true if device is currently in tablet/maximize mode, otherwise false. 40 // Returns true if device is currently in tablet/maximize mode, otherwise false.
42 bool IsTabletModeActive() { 41 bool IsTabletModeActive() {
43 MaximizeModeController* maximize_mode_controller = 42 MaximizeModeController* maximize_mode_controller =
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 WmShell::Get()->GetSessionStateDelegate(); 235 WmShell::Get()->GetSessionStateDelegate();
237 if (session_state_delegate->ShouldLockScreenAutomatically() && 236 if (session_state_delegate->ShouldLockScreenAutomatically() &&
238 session_state_delegate->CanLockScreen() && 237 session_state_delegate->CanLockScreen() &&
239 !session_state_delegate->IsUserSessionBlocked() && 238 !session_state_delegate->IsUserSessionBlocked() &&
240 !controller_->LockRequested()) { 239 !controller_->LockRequested()) {
241 session_state_delegate->LockScreen(); 240 session_state_delegate->LockScreen();
242 } 241 }
243 } 242 }
244 243
245 } // namespace ash 244 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698