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

Unified Diff: ash/wm/power_button_controller.cc

Issue 2095193002: clang-format all of //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/power_button_controller.h ('k') | ash/wm/resize_handle_window_targeter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « ash/wm/power_button_controller.h ('k') | ash/wm/resize_handle_window_targeter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698