ash/wm/lock_state_controller.h - Issue 2041233005: Moves ash::user::LoginStatus to ash/common

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/lock_state_controller.h

Issue 2041233005: Moves ash::user::LoginStatus to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix test 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:

Index: ash/wm/lock_state_controller.h

diff --git a/ash/wm/lock_state_controller.h b/ash/wm/lock_state_controller.h

index 117144b1669d8c08e9517e9c6739147079ae0aff..dfb8911e4451cc5a7424751866b45369880e16e9 100644

--- a/ash/wm/lock_state_controller.h

+++ b/ash/wm/lock_state_controller.h

@@ -212,7 +212,7 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,

void OnHostCloseRequested(const aura::WindowTreeHost* host) override;

// ShellObserver overrides:

- void OnLoginStateChanged(user::LoginStatus status) override;

+ void OnLoginStateChanged(LoginStatus status) override;

void OnAppTerminating() override;

void OnLockStateChanged(bool locked) override;

@@ -294,7 +294,7 @@ class ASH_EXPORT LockStateController : public aura::WindowTreeHostObserver,

base::ObserverList<LockStateObserver> observers_;

// The current login status, or original login status from before we locked.

- user::LoginStatus login_status_;

+ LoginStatus login_status_;

// Current lock status.

bool system_is_locked_;

« no previous file with comments | « ash/test/test_system_tray_delegate.cc ('k') | ash/wm/lock_state_controller.cc » ('j') | no next file with comments »