Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2820)

Unified Diff: content/renderer/render_view_mouse_lock_dispatcher.cc

Issue 12570005: Update user gesture related code to the new WebKit API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_mouse_lock_dispatcher.cc
diff --git a/content/renderer/render_view_mouse_lock_dispatcher.cc b/content/renderer/render_view_mouse_lock_dispatcher.cc
index a7a0bd9382b3873a5b3d43433d76f96cfbfb6a1f..40a5c70c0feb1800156188fd62eaa02260f40d55 100644
--- a/content/renderer/render_view_mouse_lock_dispatcher.cc
+++ b/content/renderer/render_view_mouse_lock_dispatcher.cc
@@ -7,9 +7,12 @@
#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/WebUserGestureIndicator.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h"
+using WebKit::WebUserGestureIndicator;
+
namespace content {
RenderViewMouseLockDispatcher::RenderViewMouseLockDispatcher(
@@ -23,10 +26,7 @@ RenderViewMouseLockDispatcher::~RenderViewMouseLockDispatcher() {
void RenderViewMouseLockDispatcher::SendLockMouseRequest(
bool unlocked_by_target) {
- bool user_gesture =
- render_view_impl_->webview() &&
- render_view_impl_->webview()->mainFrame() &&
- render_view_impl_->webview()->mainFrame()->isProcessingUserGesture();
+ bool user_gesture = WebUserGestureIndicator::isProcessingUserGesture();
Send(new ViewHostMsg_LockMouse(routing_id(), user_gesture, unlocked_by_target,
false));
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698