Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc |
| index 2ffb0941f4904d76418a629972dd878487e18442..af3447b0458313daa563d3dc8b134f13f65847b3 100644 |
| --- a/content/browser/renderer_host/render_widget_host_impl.cc |
| +++ b/content/browser/renderer_host/render_widget_host_impl.cc |
| @@ -1040,7 +1040,9 @@ gfx::Rect RenderWidgetHostImpl::GetRootWindowResizerRect() const { |
| return gfx::Rect(); |
| } |
| -void RenderWidgetHostImpl::RequestToLockMouse(bool /* user_gesture */) { |
| +void RenderWidgetHostImpl::RequestToLockMouse( |
| + bool /* user_gesture */, |
|
jam
2012/05/31 06:05:23
nit: no need to put these in comments, we don't us
dmurph
2012/05/31 21:13:49
Done.
|
| + bool /* last_unlocked_by_target */) { |
| // Directly reject to lock the mouse. Subclass can override this method to |
| // decide whether to allow mouse lock or not. |
| GotResponseToLockMouseRequest(false); |
| @@ -1485,7 +1487,9 @@ void RenderWidgetHostImpl::OnMsgDidActivateAcceleratedCompositing( |
| view_->OnAcceleratedCompositingStateChange(); |
| } |
| -void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture) { |
| +void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture, |
| + bool last_unlocked_by_target) { |
| + |
| if (pending_mouse_lock_request_) { |
| Send(new ViewMsg_LockMouse_ACK(routing_id_, false)); |
| return; |
| @@ -1495,7 +1499,7 @@ void RenderWidgetHostImpl::OnMsgLockMouse(bool user_gesture) { |
| } |
| pending_mouse_lock_request_ = true; |
| - RequestToLockMouse(user_gesture); |
| + RequestToLockMouse(user_gesture, last_unlocked_by_target); |
| } |
| void RenderWidgetHostImpl::OnMsgUnlockMouse() { |