| Index: ash/wm/power_button_controller.cc
|
| diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
|
| index 007870b0aeb15b7a3ee08a6788ba22163e482a92..227f52d33ec35d7381bb3fd92e79097a6dca2fbc 100644
|
| --- a/ash/wm/power_button_controller.cc
|
| +++ b/ash/wm/power_button_controller.cc
|
| @@ -26,8 +26,8 @@ PowerButtonController::PowerButtonController(LockStateController* controller)
|
| brightness_is_zero_(false),
|
| internal_display_off_and_external_display_on_(false),
|
| has_legacy_power_button_(
|
| - base::CommandLine::ForCurrentProcess()
|
| - ->HasSwitch(switches::kAuraLegacyPowerButton)),
|
| + base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kAuraLegacyPowerButton)),
|
| #if defined(OS_CHROMEOS)
|
| enable_quick_lock_(base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kAshEnableTouchView)),
|
| @@ -53,7 +53,8 @@ void PowerButtonController::OnScreenBrightnessChanged(double percent) {
|
| }
|
|
|
| void PowerButtonController::OnPowerButtonEvent(
|
| - bool down, const base::TimeTicks& timestamp) {
|
| + bool down,
|
| + const base::TimeTicks& timestamp) {
|
| power_button_down_ = down;
|
|
|
| if (controller_->ShutdownRequested())
|
| @@ -66,8 +67,9 @@ void PowerButtonController::OnPowerButtonEvent(
|
| return;
|
|
|
| if (volume_down_pressed_ && down &&
|
| - Shell::GetInstance()->maximize_mode_controller()->
|
| - IsMaximizeModeWindowManagerEnabled()) {
|
| + Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->IsMaximizeModeWindowManagerEnabled()) {
|
| Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled(
|
| ash::TAKE_SCREENSHOT);
|
| return;
|
| @@ -96,8 +98,10 @@ void PowerButtonController::OnPowerButtonEvent(
|
|
|
| if (session_state_delegate->CanLockScreen() &&
|
| !session_state_delegate->IsUserSessionBlocked()) {
|
| - if (Shell::GetInstance()->maximize_mode_controller()->
|
| - IsMaximizeModeWindowManagerEnabled() && enable_quick_lock_)
|
| + if (Shell::GetInstance()
|
| + ->maximize_mode_controller()
|
| + ->IsMaximizeModeWindowManagerEnabled() &&
|
| + enable_quick_lock_)
|
| controller_->StartLockAnimationAndLockImmediately(true);
|
| else
|
| controller_->StartLockAnimation(true);
|
| @@ -114,15 +118,15 @@ void PowerButtonController::OnPowerButtonEvent(
|
| }
|
|
|
| void PowerButtonController::OnLockButtonEvent(
|
| - bool down, const base::TimeTicks& timestamp) {
|
| + bool down,
|
| + const base::TimeTicks& timestamp) {
|
| lock_button_down_ = down;
|
|
|
| const SessionStateDelegate* session_state_delegate =
|
| Shell::GetInstance()->session_state_delegate();
|
| if (!session_state_delegate->CanLockScreen() ||
|
| session_state_delegate->IsScreenLocked() ||
|
| - controller_->LockRequested() ||
|
| - controller_->ShutdownRequested()) {
|
| + controller_->LockRequested() || controller_->ShutdownRequested()) {
|
| return;
|
| }
|
|
|
|
|