summaryrefslogtreecommitdiffstats
path: root/ash/root_window_controller_unittest.cc
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/root_window_controller_unittest.cc
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/root_window_controller_unittest.cc')
-rw-r--r--ash/root_window_controller_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 2635d12..ca9d340 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -67,8 +67,11 @@ class DeleteOnBlurDelegate : public aura::test::TestWindowDelegate {
virtual void OnEvent(ui::Event* event) OVERRIDE {
if (event->type() ==
views::corewm::FocusChangeEvent::focus_changing_event_type()) {
- if (event->target() == window_)
+ if (event->target() == window_) {
OnBlur();
+ // TODO(sadrul): should not be necessary.
+ event->StopPropagation();
+ }
}
}