diff options
| author | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 21:56:31 +0000 |
|---|---|---|
| committer | sschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 21:56:31 +0000 |
| commit | e0693150aabb0da07483744dbe5b1a134a7df949 (patch) | |
| tree | eefe254b84c235c9ae35b3fb341f4126d63de06c /ash/wm/workspace_controller.h | |
| parent | bb481b101a826c7415c096466a8c1e749b9521f8 (diff) | |
| download | chromium_src-e0693150aabb0da07483744dbe5b1a134a7df949.zip chromium_src-e0693150aabb0da07483744dbe5b1a134a7df949.tar.gz chromium_src-e0693150aabb0da07483744dbe5b1a134a7df949.tar.bz2 | |
Trying to activate a window in a workspace other than the current is ignored while a system modal dialog is up
Added function "OnAttemptToReactivateWindow" to ActivationChangeObserver.
WorkspaceController will activate the requested window's workspace, if the
window did not become active because of a system modal window.
BUG=196697
R=sky@chromium.org
TEST=
ash_unittests --gtest_filter='WorkspaceManagerTest.SwitchFromModal'
views_unittests --gtest_filter='FocusControllerApiTest.ReactivationEvents'
Review URL: https://chromiumcodereview.appspot.com/14222019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace_controller.h')
| -rw-r--r-- | ash/wm/workspace_controller.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h index 310c36e..3b27fee 100644 --- a/ash/wm/workspace_controller.h +++ b/ash/wm/workspace_controller.h @@ -51,6 +51,9 @@ class ASH_EXPORT WorkspaceController // aura::client::ActivationChangeObserver overrides: virtual void OnWindowActivated(aura::Window* gained_active, aura::Window* lost_active) OVERRIDE; + virtual void OnAttemptToReactivateWindow( + aura::Window* request_active, + aura::Window* actual_active) OVERRIDE; private: friend class WorkspaceControllerTestHelper; |