Remove stops_event_propagation from Window, since it's broken.

Changes it to be implemented by the Aura client, via a new interface EventClient.
The client can determine whether or not a given window and its subtree can receive events.
I also cleaned up the way screen locking is entered/exited via the delegate, and some stuff in ash/shell.

http://crbug.com/119347
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9788001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128328 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 5 deletions

diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 3c8de10..49baee5 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -15,7 +15,7 @@
 namespace ash {
 namespace test {
 
-TestShellDelegate::TestShellDelegate() {
+TestShellDelegate::TestShellDelegate() : locked_(false) {
 }
 
 TestShellDelegate::~TestShellDelegate() {
@@ -29,10 +29,17 @@ bool TestShellDelegate::CanCreateLauncher() {
   return true;
 }
 
-#if defined(OS_CHROMEOS)
 void TestShellDelegate::LockScreen() {
+  locked_ = true;
+}
+
+void TestShellDelegate::UnlockScreen() {
+  locked_ = false;
+}
+
+bool TestShellDelegate::IsScreenLocked() const {
+  return locked_;
 }
-#endif
 
 void TestShellDelegate::Exit() {
 }
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index f23517f..72412ffe 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -20,9 +20,9 @@ class TestShellDelegate : public ShellDelegate {
   // 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 @@ class TestShellDelegate : public ShellDelegate {
   virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
 
  private:
+  bool locked_;
+
   DISALLOW_COPY_AND_ASSIGN(TestShellDelegate);
 };