Remove stops_event_propagation from Window, since it's broken.

ash/shell_delegate.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_DELEGATE_H_
 #define ASH_SHELL_DELEGATE_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 31 matching lines @@
     // Windows are going to be cycled from the launcher.
     SOURCE_LAUNCHER,
   };
 
   // The Shell owns the delegate.
   virtual ~ShellDelegate() {}
 
   // Invoked to create a new status area. Can return NULL.
   virtual views::Widget* CreateStatusArea() = 0;
 
-#if defined(OS_CHROMEOS)
-  // Invoked when a user uses Ctrl-Shift-L to lock the screen.
+  // Invoked when a user locks the screen.
   virtual void LockScreen() = 0;
-#endif
+
+  virtual void UnlockScreen() = 0;
+
+  // Returns true if the screen is currently locked.
+  virtual bool IsScreenLocked() const = 0;
 
   // Invoked when a user uses Ctrl-Shift-Q to close chrome.
   virtual void Exit() = 0;
 
   // Invoked to create an AppListViewDelegate. Shell takes the ownership of
   // the created delegate.
   virtual AppListViewDelegate* CreateAppListViewDelegate() = 0;
 
   // Returns a list of windows to cycle with keyboard shortcuts (e.g. alt-tab
   // or the window switching key).  If |order_by_activity| is true then windows
@@ skipping 12 matching lines @@
   virtual LauncherDelegate* CreateLauncherDelegate(
       ash::LauncherModel* model) = 0;
 
   // Creates a system-tray delegate. Shell takes ownership of the delegate.
   virtual SystemTrayDelegate* CreateSystemTrayDelegate(SystemTray* tray) = 0;
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_DELEGATE_H_