Encode frame number in pixel data for pose sync

chrome/browser/android/vr_shell/vr_controller.h

Index: chrome/browser/android/vr_shell/vr_controller.h
diff --git a/chrome/browser/android/vr_shell/vr_controller.h b/chrome/browser/android/vr_shell/vr_controller.h
index f5e9a4774b4f2ca98f268a944eb672164635f38b..8fbe80d025e67c785bb7bcf713dcefd9d9e8b745 100644
--- a/chrome/browser/android/vr_shell/vr_controller.h
+++ b/chrome/browser/android/vr_shell/vr_controller.h
@@ -7,9 +7,9 @@
 
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/android/vr_shell/vr_gesture.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_controller.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"

[bajones, 2016/10/04 06:33:57]

I think you've gotten some changes in here that you didn't intend. Make sure
your branch has the right upstream.

[klausw, 2016/10/04 06:47:04]

This is intentional though messy. Top-of-tree is still on GVR 0.9.1 which isn't
very useful for testing, so I've based it on your earlier GVR 1.0.0 branch.
However, some files that were edited since then needed modification to work with
the new GVR API.

I can hide this part of the diff by rebasing it below the "git cl upload" base,
but we'll need these changes at some point.

[klausw, 2016/10/04 17:52:46]

Rebased, this should no longer be visible.

+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_controller.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace vr_shell {
 
@@ -44,8 +44,8 @@ class VrController {
 
   bool IsTouchUp();
 
-  bool IsButtonUp(const int32_t button);
-  bool IsButtonDown(const int32_t button);
+  bool IsButtonUp(const gvr::ControllerButton button);
+  bool IsButtonDown(const gvr::ControllerButton button);
 
   bool IsConnected();