Remove stops_event_propagation from Window, since it's broken.

chrome/browser/ui/views/ash/chrome_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 CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_
 #define CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_
 #pragma once
 
 #include "ash/launcher/launcher_types.h"
 #include "ash/shell_delegate.h"
@@ skipping 16 matching lines @@
   static ChromeShellDelegate* instance() { return instance_; }
 
   StatusAreaHostAura* status_area_host() {
     return status_area_host_.get();
   }
 
   StatusAreaView* GetStatusArea();
 
   // ash::ShellDelegate overrides;
   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 ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
   virtual std::vector<aura::Window*> GetCycleWindowList(
       CycleSource source) const OVERRIDE;
   virtual void StartPartialScreenshot(
       ash::ScreenshotDelegate* screenshot_delegate) OVERRIDE;
   virtual ash::LauncherDelegate* CreateLauncherDelegate(
       ash::LauncherModel* model) OVERRIDE;
   virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate(
       ash::SystemTray* tray) OVERRIDE;
 
  private:
   static ChromeShellDelegate* instance_;
 
   scoped_ptr<StatusAreaHostAura> status_area_host_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ASH_CHROME_SHELL_DELEGATE_H_