diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 20:47:17 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 20:47:17 +0000 |
| commit | 869f63584313127e61ba26413a1fca3fa66c7819 (patch) | |
| tree | 4aa76974e20c0efdf966d4f51e45ee7dafc173b3 /ash/shell.h | |
| parent | 69793ad506993edd0330fa52a81ad80ca280d0fb (diff) | |
| download | chromium_src-869f63584313127e61ba26413a1fca3fa66c7819.zip chromium_src-869f63584313127e61ba26413a1fca3fa66c7819.tar.gz chromium_src-869f63584313127e61ba26413a1fca3fa66c7819.tar.bz2 | |
Get some of the ash_unittests to run without crashing.
We currently make it as far as RootWindowControllerTest.MoveWindows_Basic.
This CL:
- changes ui::EventTarget::CanAcceptEvents to be CanAcceptEvent and take an event. This allows the event type to determine whether or not it can be accepted by the target.
- copy-pasta from ActivationController to AshActivationRules (GetNextWindowToActivate())
- forwarding to target handler for generic events in EventTarget
- RootWindowControllerTest needs to handle activation events @ the target and forward to OnBlur impl.
http://crbug.com/162100
R=sadrul@chromium.org
Review URL: https://codereview.chromium.org/11445023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell.h b/ash/shell.h index 1ea200d..ec50145 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -449,7 +449,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, virtual bool CanWindowReceiveEvents(aura::Window* window) OVERRIDE; // Overridden from ui::EventTarget: - virtual bool CanAcceptEvents() OVERRIDE; + virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE; virtual EventTarget* GetParentTarget() OVERRIDE; static Shell* instance_; |