summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/test_session_state_delegate.cc11
-rw-r--r--ash/test/test_session_state_delegate.h6
2 files changed, 13 insertions, 4 deletions
diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc
index e1085c0..722981f 100644
--- a/ash/test/test_session_state_delegate.cc
+++ b/ash/test/test_session_state_delegate.cc
@@ -40,6 +40,12 @@ TestSessionStateDelegate::TestSessionStateDelegate()
TestSessionStateDelegate::~TestSessionStateDelegate() {
}
+content::BrowserContext*
+TestSessionStateDelegate::GetBrowserContextByIndex(
+ MultiProfileIndex index) {
+ return NULL;
+}
+
int TestSessionStateDelegate::GetMaximumNumberOfLoggedInUsers() const {
return 3;
}
@@ -133,11 +139,12 @@ const std::string TestSessionStateDelegate::GetUserID(
}
const gfx::ImageSkia& TestSessionStateDelegate::GetUserImage(
- MultiProfileIndex index) const {
+ content::BrowserContext* context) const {
return null_image_;
}
-void TestSessionStateDelegate::GetLoggedInUsers(UserIdList* users) {
+bool TestSessionStateDelegate::ShouldShowAvatar(aura::Window* window) {
+ return false;
}
void TestSessionStateDelegate::SwitchActiveUser(const std::string& user_id) {
diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h
index 1277a068..21c34f6 100644
--- a/ash/test/test_session_state_delegate.h
+++ b/ash/test/test_session_state_delegate.h
@@ -22,6 +22,8 @@ class TestSessionStateDelegate : public SessionStateDelegate {
const std::string& get_activated_user() { return activated_user_; }
// SessionStateDelegate:
+ virtual content::BrowserContext* GetBrowserContextByIndex(
+ MultiProfileIndex index) OVERRIDE;
virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;
virtual int NumberOfLoggedInUsers() const OVERRIDE;
virtual bool IsActiveUserSessionStarted() const OVERRIDE;
@@ -38,8 +40,8 @@ class TestSessionStateDelegate : public SessionStateDelegate {
virtual const std::string GetUserID(
ash::MultiProfileIndex index) const OVERRIDE;
virtual const gfx::ImageSkia& GetUserImage(
- ash::MultiProfileIndex index) const OVERRIDE;
- virtual void GetLoggedInUsers(UserIdList* users) OVERRIDE;
+ content::BrowserContext* context) const OVERRIDE;
+ virtual bool ShouldShowAvatar(aura::Window* window) OVERRIDE;
virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
virtual void AddSessionStateObserver(