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

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

Unified 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, 7 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:

Index: ash/wm/power_button_controller.cc

diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc

index 685060806036a8a0ed30dc89830fa437ce0299d4..e489676cafd1f4c6d151a269a8e47226ae97597e 100644

--- a/ash/wm/power_button_controller.cc

+++ b/ash/wm/power_button_controller.cc

@@ -8,15 +8,16 @@

#include "ash/session_state_delegate.h"

#include "ash/shell.h"

#include "ash/shell_window_ids.h"

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

#include "ash/wm/session_state_animator.h"

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

#include "base/command_line.h"

#include "ui/aura/root_window.h"

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

namespace ash {

-PowerButtonController::PowerButtonController(SessionStateController* controller)

+PowerButtonController::PowerButtonController(

+ SessionLockStateController* controller)

: power_button_down_(false),

lock_button_down_(false),

screen_is_off_(false),