diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 16:29:39 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 16:29:39 +0000 |
| commit | 42252e078e8bd3d278bc2c33e8ae593c265210fe (patch) | |
| tree | 5c5f9ab20bf17bb3af0ad3c0a020ae9b40bad017 /content/renderer/mouse_lock_dispatcher.cc | |
| parent | ada30200303b4764d634a30923f619abcb848f71 (diff) | |
| download | chromium_src-42252e078e8bd3d278bc2c33e8ae593c265210fe.zip chromium_src-42252e078e8bd3d278bc2c33e8ae593c265210fe.tar.gz chromium_src-42252e078e8bd3d278bc2c33e8ae593c265210fe.tar.bz2 | |
User Gesture plumbed from Renderer to Browser's FullscreenController::RequestToLockMouse.
Part of a larger set of patches refactoring FullscreenController to support mouse lock in windowed (not fullscreen) mode.
R=yzshen@chromium.org
BUG=107320
Review URL: https://chromiumcodereview.appspot.com/10173030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/mouse_lock_dispatcher.cc')
| -rw-r--r-- | content/renderer/mouse_lock_dispatcher.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/content/renderer/mouse_lock_dispatcher.cc b/content/renderer/mouse_lock_dispatcher.cc index 41ed654..886067c 100644 --- a/content/renderer/mouse_lock_dispatcher.cc +++ b/content/renderer/mouse_lock_dispatcher.cc @@ -6,6 +6,7 @@ #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" @@ -28,7 +29,12 @@ bool MouseLockDispatcher::LockMouse(LockTarget* target) { pending_lock_request_ = true; target_ = target; - Send(new ViewHostMsg_LockMouse(routing_id())); + bool user_gesture = + render_view_impl_->webview() && + render_view_impl_->webview()->mainFrame() && + render_view_impl_->webview()->mainFrame()->isProcessingUserGesture(); + + Send(new ViewHostMsg_LockMouse(routing_id(), user_gesture)); return true; } |
