ash/wm/power_button_controller.cc - Issue 15974008: Rename SessionStateController -> LockStateController

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 15974008: Rename SessionStateController -> LockStateController (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 7 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 unified diff | Download patch | Annotate | Revision Log

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/session_state_delegate.h"	8 #include "ash/session_state_delegate.h"

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

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

	11 #include "ash/wm/session_lock_state_controller.h"

11 #include "ash/wm/session_state_animator.h"	12 #include "ash/wm/session_state_animator.h"

12 #include "ash/wm/session_state_controller.h"

13 #include "base/command_line.h"	13 #include "base/command_line.h"

14 #include "ui/aura/root_window.h"	14 #include "ui/aura/root_window.h"

15 #include "ui/views/corewm/compound_event_filter.h"	15 #include "ui/views/corewm/compound_event_filter.h"

16	16

17 namespace ash {	17 namespace ash {

18	18

19 PowerButtonController::PowerButtonController(SessionStateController* controller)	19 PowerButtonController::PowerButtonController(

	20 SessionLockStateController* controller)

20 : power_button_down_(false),	21 : power_button_down_(false),

21 lock_button_down_(false),	22 lock_button_down_(false),

22 screen_is_off_(false),	23 screen_is_off_(false),

23 has_legacy_power_button_(	24 has_legacy_power_button_(

24 CommandLine::ForCurrentProcess()->HasSwitch(	25 CommandLine::ForCurrentProcess()->HasSwitch(

25 switches::kAuraLegacyPowerButton)),	26 switches::kAuraLegacyPowerButton)),

26 controller_(controller) {	27 controller_(controller) {

27 }	28 }

28	29

29 PowerButtonController::~PowerButtonController() {	30 PowerButtonController::~PowerButtonController() {

(...skipping 70 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
100 if (power_button_down_)	101 if (power_button_down_)

101 return;	102 return;

102	103

103 if (down)	104 if (down)

104 controller_->StartLockAnimation(false);	105 controller_->StartLockAnimation(false);

105 else	106 else

106 controller_->CancelLockAnimation();	107 controller_->CancelLockAnimation();

107 }	108 }

108	109

109 } // namespace ash	110 } // namespace ash

OLD	NEW

« ash/ash.gyp ('K') | « ash/wm/power_button_controller.h ('k') | ash/wm/power_button_controller_unittest.cc » ('j') | ash/wm/toplevel_window_event_handler_unittest.cc » ('J')