| Index: ash/session_state_delegate_stub.h
|
| diff --git a/ash/session_state_delegate_stub.h b/ash/session_state_delegate_stub.h
|
| index 8c27e9af0d7de2982d1496788dd6653b1087bddd..5693fa75ba8d41181d28a73324e2d424e350105f 100644
|
| --- a/ash/session_state_delegate_stub.h
|
| +++ b/ash/session_state_delegate_stub.h
|
| @@ -21,6 +21,8 @@ class SessionStateDelegateStub : public SessionStateDelegate {
|
| // SessionStateDelegate:
|
| virtual content::BrowserContext* GetBrowserContextByIndex(
|
| MultiProfileIndex index) OVERRIDE;
|
| + virtual content::BrowserContext* GetBrowserContextForWindow(
|
| + aura::Window* window) OVERRIDE;
|
| virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;
|
| virtual int NumberOfLoggedInUsers() const OVERRIDE;
|
| virtual bool IsActiveUserSessionStarted() const OVERRIDE;
|
| @@ -50,7 +52,7 @@ class SessionStateDelegateStub : public SessionStateDelegate {
|
| bool screen_locked_;
|
|
|
| // A pseudo user image.
|
| - gfx::ImageSkia null_image_;
|
| + gfx::ImageSkia user_image_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
|
| };
|
|
|