diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 16:58:34 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 16:58:34 +0000 |
| commit | cfad875c42dc022d8632dc19b9cf7647b14e9ee9 (patch) | |
| tree | a90005ced7fadb1fb77ff7038e23d822fef95b4f /ash/test | |
| parent | 08a21f37b4668e33a2cf760e25f37178712a6de3 (diff) | |
| download | chromium_src-cfad875c42dc022d8632dc19b9cf7647b14e9ee9.zip chromium_src-cfad875c42dc022d8632dc19b9cf7647b14e9ee9.tar.gz chromium_src-cfad875c42dc022d8632dc19b9cf7647b14e9ee9.tar.bz2 | |
Add SessionStateObserver with ActiveUserChanged()
Depends on https://codereview.chromium.org/15974008/ which renames SessionStateObserver to LockStateObserver
* Rename few instances of email to user_id
* Add SessionStateDelegateChromeos implementation
BUG=180903
R=bartfab@chromium.org, skuhne@chromium.org, sky@chromium.org, stevenjb@chromium.org
Review URL: https://codereview.chromium.org/15718003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_session_state_delegate.cc | 9 | ||||
| -rw-r--r-- | ash/test/test_session_state_delegate.h | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc index 22fdfac..1fdfef6 100644 --- a/ash/test/test_session_state_delegate.cc +++ b/ash/test/test_session_state_delegate.cc @@ -88,13 +88,20 @@ const gfx::ImageSkia& TestSessionStateDelegate::GetUserImage( return null_image_; } -void TestSessionStateDelegate::GetLoggedInUsers(UserEmailList* users) { +void TestSessionStateDelegate::GetLoggedInUsers(UserIdList* users) { } void TestSessionStateDelegate::SwitchActiveUser(const std::string& email) { activated_user_ = email; } +void TestSessionStateDelegate::AddSessionStateObserver( + ash::SessionStateObserver* observer) { +} + +void TestSessionStateDelegate::RemoveSessionStateObserver( + ash::SessionStateObserver* observer) { +} } // namespace test } // namespace ash diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h index 83944d4..17062d5 100644 --- a/ash/test/test_session_state_delegate.h +++ b/ash/test/test_session_state_delegate.h @@ -35,8 +35,12 @@ class TestSessionStateDelegate : public SessionStateDelegate { ash::MultiProfileIndex index) const OVERRIDE; virtual const gfx::ImageSkia& GetUserImage( ash::MultiProfileIndex index) const OVERRIDE; - virtual void GetLoggedInUsers(UserEmailList* users) OVERRIDE; + virtual void GetLoggedInUsers(UserIdList* users) OVERRIDE; virtual void SwitchActiveUser(const std::string& email) OVERRIDE; + virtual void AddSessionStateObserver( + ash::SessionStateObserver* observer) OVERRIDE; + virtual void RemoveSessionStateObserver( + ash::SessionStateObserver* observer) OVERRIDE; // Updates the internal state that indicates whether a session is in progress // and there is an active user. If |has_active_user| is |false|, |