| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_ | 
| 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_ | 
| 7 | 7 | 
| 8 #include <memory> | 8 #include <memory> | 
| 9 #include <vector> | 9 #include <vector> | 
| 10 | 10 | 
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 52   float TouchPosY(); | 52   float TouchPosY(); | 
| 53 | 53 | 
| 54   const gvr::Quatf Orientation(); | 54   const gvr::Quatf Orientation(); | 
| 55 | 55 | 
| 56   bool TouchDownHappened(); | 56   bool TouchDownHappened(); | 
| 57 | 57 | 
| 58   bool TouchUpHappened(); | 58   bool TouchUpHappened(); | 
| 59 | 59 | 
| 60   bool ButtonUpHappened(gvr::ControllerButton button); | 60   bool ButtonUpHappened(gvr::ControllerButton button); | 
| 61   bool ButtonDownHappened(gvr::ControllerButton button); | 61   bool ButtonDownHappened(gvr::ControllerButton button); | 
|  | 62   bool ButtonState(gvr::ControllerButton button); | 
| 62 | 63 | 
| 63   bool IsConnected(); | 64   bool IsConnected(); | 
| 64 | 65 | 
| 65  private: | 66  private: | 
| 66   enum GestureDetectorState { | 67   enum GestureDetectorState { | 
| 67     WAITING,   // waiting for user to touch down | 68     WAITING,   // waiting for user to touch down | 
| 68     TOUCHING,  // touching the touch pad but not scrolling | 69     TOUCHING,  // touching the touch pad but not scrolling | 
| 69     SCROLLING  // scrolling on the touch pad | 70     SCROLLING  // scrolling on the touch pad | 
| 70   }; | 71   }; | 
| 71 | 72 | 
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 162 | 163 | 
| 163   // Number of consecutively extrapolated touch points | 164   // Number of consecutively extrapolated touch points | 
| 164   int extrapolated_touch_ = 0; | 165   int extrapolated_touch_ = 0; | 
| 165 | 166 | 
| 166   DISALLOW_COPY_AND_ASSIGN(VrController); | 167   DISALLOW_COPY_AND_ASSIGN(VrController); | 
| 167 }; | 168 }; | 
| 168 | 169 | 
| 169 }  // namespace vr_shell | 170 }  // namespace vr_shell | 
| 170 | 171 | 
| 171 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_ | 172 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_ | 
| OLD | NEW | 
|---|