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

Side by Side Diff: chrome/browser/android/vr_shell/vr_controller.h

Issue 2598093002: Update GVR to 1.10.0 (Closed)
Patch Set: Created 3 years, 12 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 unified diff | Download patch
OLDNEW
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
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "third_party/WebKit/public/platform/WebGestureEvent.h" 12 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
13 #include "third_party/WebKit/public/platform/WebInputEvent.h" 13 #include "third_party/WebKit/public/platform/WebInputEvent.h"
14 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h" 14 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/ gvr_types.h"
15 15
16 using blink::WebGestureEvent; 16 using blink::WebGestureEvent;
17 using blink::WebInputEvent; 17 using blink::WebInputEvent;
18 18
19 namespace gvr { 19 namespace gvr {
20 class ControllerState; 20 class ControllerState;
21 } 21 }
22 22
23 namespace vr_shell { 23 namespace vr_shell {
24 24
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 int64_t last_touch_timestamp_ = 0; 150 int64_t last_touch_timestamp_ = 0;
151 int64_t last_timestamp_nanos_ = 0; 151 int64_t last_timestamp_nanos_ = 0;
152 152
153 DISALLOW_COPY_AND_ASSIGN(VrController); 153 DISALLOW_COPY_AND_ASSIGN(VrController);
154 }; 154 };
155 155
156 } // namespace vr_shell 156 } // namespace vr_shell
157 157
158 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_ 158 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements.h ('k') | chrome/browser/android/vr_shell/vr_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698