diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 00:08:18 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 00:08:18 +0000 |
commit | d219a19a5139d4917440c730c64b19c13b486291 (patch) | |
tree | a8dad68b8d936e64b9e2e65bd7e301660a8d88d2 /ash/shell.h | |
parent | f6fd98a8327d82693ba458846d13990a1d1175e2 (diff) | |
download | chromium_src-d219a19a5139d4917440c730c64b19c13b486291.zip chromium_src-d219a19a5139d4917440c730c64b19c13b486291.tar.gz chromium_src-d219a19a5139d4917440c730c64b19c13b486291.tar.bz2 |
Get the rest of the ash_unittests to pass with the new FocusController (!)
Ash changes:
. Active RootWindow as tracked by the shell must only be updated when activation isn't being cleared.
. AshFocusRules' method that locates the next window to activate now searches forward and backward from the destroyed window's container. It used to only search forward.
. Some tests test for conditions that are no longer valid with the new focus controller, so we put some conditionals into the tests (PanelLayoutManagerTest and WindowManagerTest).
. ToplevelWindowEventFilterTest had an incomplete ash environment that wasn't getting all the right logic, so changed it to use full-ash.
. BubbleDelegateView needs to remove its observer to avoid a crash.
Core logic changes:
. A window must be focusable for it to be activatable. For some reason this test had eluded earlier incarnations.
. GetActivatableWindow() needs to be able to jump to a modal transient if one is present.
. GetFocusableWindow() needs to be able to hop to the next activatable window if the specified window isn't activatable.
. Prevent recursion in processing focus/activation changes.
. Prevent changing focus to the parent window when a child is focused.
R=sky@chromium.org
http://crbug.com/162100
Review URL: https://codereview.chromium.org/11519040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r-- | ash/shell.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ash/shell.h b/ash/shell.h index e8156e0..34de721 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -336,6 +336,9 @@ class ASH_EXPORT Shell PartialMagnificationController* partial_magnification_controller() { return partial_magnification_controller_.get(); } + aura::client::ActivationClient* activation_client() { + return activation_client_; + } ScreenAsh* screen() { return screen_; } @@ -403,10 +406,6 @@ class ASH_EXPORT Shell browser_context_ = browser_context; } - aura::client::ActivationClient* activation_client() { - return activation_client_; - } - // Initializes the root window to be used for a secondary display. void InitRootWindowForSecondaryDisplay(aura::RootWindow* root); |