Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1712)

Unified Diff: ash/test/test_shell_delegate.h

Issue 9788001: Remove stops_event_propagation from Window, since it's broken. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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:
View side-by-side diff with in-line comments
Download patch
Index: ash/test/test_shell_delegate.h
===================================================================
--- ash/test/test_shell_delegate.h (revision 127786)
+++ ash/test/test_shell_delegate.h (working copy)
@@ -19,9 +19,9 @@
// Overridden from ShellDelegate:
virtual views::Widget* CreateStatusArea() 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(
@@ -33,6 +33,8 @@
virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* t) OVERRIDE;
private:
+ bool locked_;
+
DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
};

Powered by Google App Engine
This is Rietveld 408576698