Implement controller handling in vr_shell.cc

chrome/browser/android/vr_shell/vr_input_manager.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/android/scoped_java_ref.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/android/vr_shell/vr_input_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 using blink::WebGestureEvent;
@@ skipping 25 matching lines @@
 
   if (gesture.type == WebInputEvent::GestureScrollBegin ||
       gesture.type == WebInputEvent::GestureScrollUpdate ||
       gesture.type == WebInputEvent::GestureScrollEnd) {
     SendScrollEvent(event_time_milliseconds, 0.0f, 0.0f,
                     gesture.details.scroll.delta.x,
                     gesture.details.scroll.delta.y, gesture.type);
   } else if (gesture.type == WebInputEvent::GestureTap) {
     SendClickEvent(event_time_milliseconds, gesture.details.buttons.pos.x,
                    gesture.details.buttons.pos.y);
-  } else if (gesture.type == WebInputEvent::MouseMove) {
+  } else if (gesture.type == WebInputEvent::MouseMove ||
+             gesture.type == WebInputEvent::MouseEnter ||
+             gesture.type == WebInputEvent::MouseLeave) {
     SendMouseMoveEvent(event_time_milliseconds, gesture.details.move.delta.x,
-                       gesture.details.move.delta.y, gesture.details.move.type);
+                       gesture.details.move.delta.y, gesture.type);
   }
 }
 
 void VrInputManager::ScrollBegin(int64_t time_ms,
                                  float x,
                                  float y,
                                  float hintx,
                                  float hinty,
                                  bool target_viewport) {
   WebGestureEvent event =
@@ skipping 53 matching lines @@
     }
     case WebInputEvent::GestureScrollEnd: {
       WebGestureEvent event_end =
           MakeGestureEvent(WebInputEvent::GestureScrollEnd, time_ms, 0, 0);
       ForwardGestureEvent(event_end);
       break;
     }
   }
 }
 
 void VrInputManager::SendMouseMoveEvent(int64_t time_ms,

[bshe, 2016/10/04 13:50:42]

Nit: perhap rename to SendMouseEvent since this is not strictly for MouseMove
events

[mthiesse, 2016/10/04 14:05:26]

Done.

                                         float x,
                                         float y,
-                                        int type) {
+                                        WebInputEvent::Type type) {
   WebMouseEvent result;
 
-  result.type = WebInputEvent::MouseMove;
+  result.type = type;
   result.pointerType = blink::WebPointerProperties::PointerType::Mouse;
   result.x = x / dpi_scale_;
   result.y = y / dpi_scale_;
   result.windowX = x / dpi_scale_;
   result.windowY = y / dpi_scale_;
   result.timeStampSeconds = time_ms / 1000.0;
   result.clickCount = 1;
   result.modifiers = 0;
-
-  if (type == 1) {
-    result.type = WebInputEvent::MouseEnter;
-  } else if (type == 2) {
-    result.type = WebInputEvent::MouseLeave;
-  }
   result.button = WebMouseEvent::Button::NoButton;
 
   ForwardMouseEvent(result);
 }
 
 void VrInputManager::SendClickEvent(int64_t time_ms, float x, float y) {
   WebGestureEvent tap_down_event =
       MakeGestureEvent(WebInputEvent::GestureTapDown, time_ms, x, y);
   tap_down_event.data.tap.tapCount = 1;
   ForwardGestureEvent(tap_down_event);
@@ skipping 79 matching lines @@
 }
 
 void VrInputManager::ForwardMouseEvent(const blink::WebMouseEvent& event) {
   content::RenderWidgetHost* rwh =
       web_contents_->GetRenderWidgetHostView()->GetRenderWidgetHost();
   if (rwh)
     rwh->ForwardMouseEvent(event);
 }
 
 }  // namespace vr_shell