diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:21:17 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:21:17 +0000 |
| commit | e8de9ea15ead4a310e303b86f785433c837e5910 (patch) | |
| tree | 400fd599de7f09887fa28695186e102a570b7ca8 /ash/shell/app_list.cc | |
| parent | 5ebd74c164778f697a4deea82bc0fd469c6999fd (diff) | |
| download | chromium_src-e8de9ea15ead4a310e303b86f785433c837e5910.zip chromium_src-e8de9ea15ead4a310e303b86f785433c837e5910.tar.gz chromium_src-e8de9ea15ead4a310e303b86f785433c837e5910.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128328
Review URL: https://chromiumcodereview.appspot.com/9788001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/app_list.cc')
| -rw-r--r-- | ash/shell/app_list.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index 80ff70e..2003b32 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc @@ -7,6 +7,8 @@ #include "ash/app_list/app_list_model.h" #include "ash/app_list/app_list_view_delegate.h" #include "ash/app_list/app_list_view.h" +#include "ash/shell.h" +#include "ash/shell_delegate.h" #include "ash/shell/example_factory.h" #include "ash/shell/toplevel_window.h" #include "base/basictypes.h" @@ -80,7 +82,7 @@ class WindowTypeLauncherItem : public ash::AppListItemModel { break; } case LOCK_SCREEN: { - CreateLockScreen(); + Shell::GetInstance()->delegate()->LockScreen(); break; } case WIDGETS_WINDOW: { |