summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 17:15:48 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-07 17:15:48 +0000
commit049cf34bd4341fedb1eefb76423ec693e06c19d9 (patch)
tree3fabeedc694cec8b7cb46543834a24d6d1df4752 /ash/shell.h
parentf216b7e872af2863e0114a2fe4cfdff60cad5912 (diff)
downloadchromium_src-049cf34bd4341fedb1eefb76423ec693e06c19d9.zip
chromium_src-049cf34bd4341fedb1eefb76423ec693e06c19d9.tar.gz
chromium_src-049cf34bd4341fedb1eefb76423ec693e06c19d9.tar.bz2
More ash_unittests run without crashing/pass with new focus controller.
. Listen for ActivationChanged events to minimized windows on BaseLayoutManager and show the activated window (BLM is also responsible for hiding minimized windows) . Stop the annoying cursor movement for RWHWin while the tests are running. There's never a reason for us to do this on win32. . Listen for FocusChanging events in the DeleteOnBlur delegate in RootWindowControllerTest. Currently calls StopPropagation since the handler is deleted. Will not be necessary after sadrul's latest. . Shell keeps track of active root window now as an activation event handler (in the old world, the ActivationController manually updated this). . TestActivationDelegate is also an activation event handler. . FocusController responds to hides on visibility changED vs changING since that's necessary to restore activation properly after hiding a system modal window. http://crbug.com/162100 R=sadrul@chromium.org Review URL: https://codereview.chromium.org/11446050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h
index ec50145..5ba1df6 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -451,6 +451,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate,
// Overridden from ui::EventTarget:
virtual bool CanAcceptEvent(const ui::Event& event) OVERRIDE;
virtual EventTarget* GetParentTarget() OVERRIDE;
+ virtual void OnEvent(ui::Event* event) OVERRIDE;
static Shell* instance_;