| Index: ash/test/test_shell_delegate.h
|
| ===================================================================
|
| --- ash/test/test_shell_delegate.h (revision 128508)
|
| +++ ash/test/test_shell_delegate.h (working copy)
|
| @@ -20,9 +20,9 @@
|
| // Overridden from ShellDelegate:
|
| virtual views::Widget* CreateStatusArea() OVERRIDE;
|
| virtual bool CanCreateLauncher() OVERRIDE;
|
| -#if defined(OS_CHROMEOS)
|
| virtual void LockScreen() OVERRIDE;
|
| -#endif
|
| + virtual void UnlockScreen() OVERRIDE;
|
| + virtual bool IsScreenLocked() const OVERRIDE;
|
| virtual void Exit() OVERRIDE;
|
| virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
|
| virtual std::vector<aura::Window*> GetCycleWindowList(
|
| @@ -35,6 +35,8 @@
|
| virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
|
|
|
| private:
|
| + bool locked_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
|
| };
|
|
|
|
|