diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 23:35:56 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 23:35:56 +0000 |
| commit | 4b87bc2e3c13bd572a2b1b9a08ea2644120e6d6c (patch) | |
| tree | d1dd9f473c130f4e51a9cda7e8b49cb42c8f13bf /ash/test | |
| parent | 4ad932db8c764a861f9c5a578599271f179a9020 (diff) | |
| download | chromium_src-4b87bc2e3c13bd572a2b1b9a08ea2644120e6d6c.zip chromium_src-4b87bc2e3c13bd572a2b1b9a08ea2644120e6d6c.tar.gz chromium_src-4b87bc2e3c13bd572a2b1b9a08ea2644120e6d6c.tar.bz2 | |
Revert 128328 - 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
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9808044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128338 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 13 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 6 |
2 files changed, 5 insertions, 14 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 49baee5..3c8de10 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() : locked_(false) { +TestShellDelegate::TestShellDelegate() { } TestShellDelegate::~TestShellDelegate() { @@ -29,17 +29,10 @@ 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 72412ffe..f23517f 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; - virtual void UnlockScreen() OVERRIDE; - virtual bool IsScreenLocked() const OVERRIDE; +#endif virtual void Exit() OVERRIDE; virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; virtual std::vector<aura::Window*> GetCycleWindowList( @@ -35,8 +35,6 @@ class TestShellDelegate : public ShellDelegate { virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE; private: - bool locked_; - DISALLOW_COPY_AND_ASSIGN(TestShellDelegate); }; |