ash/wm/power_button_controller.cc - Issue 11220002: Add new animations in second implementation.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/wm/power_button_controller.cc

Issue 11220002: Add new animations in second implementation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Added shutdown animations Created 8 years, 2 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:

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/wm/power_button_controller.h"	5 #include "ash/wm/power_button_controller.h"

6	6

7 #include "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "ash/shell_delegate.h"	9 #include "ash/shell_delegate.h"

10 #include "ash/shell_window_ids.h"	10 #include "ash/shell_window_ids.h"

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 // something completely stupid if that assumption changes later).	87 // something completely stupid if that assumption changes later).

88 if (power_button_down_)	88 if (power_button_down_)

89 return;	89 return;

90	90

91 if (controller_->IsLocked() \|\| controller_->LockRequested())	91 if (controller_->IsLocked() \|\| controller_->LockRequested())

92 return;	92 return;

93	93

94 if (down)	94 if (down)

95 controller_->StartLockAnimation();	95 controller_->StartLockAnimation();

96 else	96 else

97 controller_->CancelLockWithOtherAnimation();	97 controller_->CancelLockAnimation();

98 }	98 }

99	99

100 } // namespace ash	100 } // namespace ash

OLD	NEW