diff options
| author | dmurph@chromium.org <dmurph@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 00:15:44 +0000 |
|---|---|---|
| committer | dmurph@chromium.org <dmurph@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 00:15:44 +0000 |
| commit | a9c81f02b244f2afd0c9756e51053dca164c7fcd (patch) | |
| tree | 17e4d40135df14a129da3dbe6a670f27044f6910 /content/renderer/mouse_lock_dispatcher.h | |
| parent | 15a36f4314b55a421270356c1c7e62722be06b9e (diff) | |
| download | chromium_src-a9c81f02b244f2afd0c9756e51053dca164c7fcd.zip chromium_src-a9c81f02b244f2afd0c9756e51053dca164c7fcd.tar.gz chromium_src-a9c81f02b244f2afd0c9756e51053dca164c7fcd.tar.bz2 | |
- Added test for silent mouse lock after unlocked by target, added argument to mouse lock request in tests for after_target_unlock_request.
- mouse lock dispatcher keeps track of voluntary unlocks by the target, and adds this as a parameter for the lock request. Fullscreen controller will silently lock the mouse when the mouse was previously voluntarily unlocked by the target.
Contributed by dmurph@chromium.com
BUG=113460
Review URL: https://chromiumcodereview.appspot.com/10443045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/mouse_lock_dispatcher.h')
| -rw-r--r-- | content/renderer/mouse_lock_dispatcher.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/content/renderer/mouse_lock_dispatcher.h b/content/renderer/mouse_lock_dispatcher.h index 8035d09..f77f56e 100644 --- a/content/renderer/mouse_lock_dispatcher.h +++ b/content/renderer/mouse_lock_dispatcher.h @@ -76,6 +76,11 @@ class CONTENT_EXPORT MouseLockDispatcher : public content::RenderViewObserver { bool pending_lock_request_; bool pending_unlock_request_; + // Used when locking to indicate when a target application has voluntarily + // unlocked and desires to relock the mouse. If the mouse is unlocked due + // to ESC being pressed by the user, this will be false + bool unlocked_by_target_; + // |target_| is the pending or current owner of mouse lock. We retain a non // owning reference here that must be cleared by |OnLockTargetDestroyed| // when it is destroyed. |