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

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

Issue 2497033002: Break apart WebGestureEvent from WebInputEvent. (Closed)
Patch Set: Rebase Created 4 years, 1 month 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
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/android/vr_shell/vr_input_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/web/WebInputEvent.h" 12 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
13 #include "third_party/WebKit/public/platform/WebInputEvent.h"
13 #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/ndk/include/vr/gvr/capi/include/gvr_ty pes.h"
14 15
15 using blink::WebGestureEvent; 16 using blink::WebGestureEvent;
16 using blink::WebInputEvent; 17 using blink::WebInputEvent;
17 18
18 namespace gvr { 19 namespace gvr {
19 class ControllerState; 20 class ControllerState;
20 } 21 }
21 22
22 namespace vr_shell { 23 namespace vr_shell {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 146
146 int64_t last_touch_timestamp_ = 0; 147 int64_t last_touch_timestamp_ = 0;
147 int64_t last_timestamp_nanos_ = 0; 148 int64_t last_timestamp_nanos_ = 0;
148 149
149 DISALLOW_COPY_AND_ASSIGN(VrController); 150 DISALLOW_COPY_AND_ASSIGN(VrController);
150 }; 151 };
151 152
152 } // namespace vr_shell 153 } // namespace vr_shell
153 154
154 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_ 155 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/android/vr_shell/vr_input_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698