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

Side by Side Diff: content/renderer/vr/vr_dispatcher.h

Issue 1504913002: Revert of Enforce marking "override" for functions overriding Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « content/renderer/render_frame_impl.h ('k') | content/renderer/wake_lock/wake_lock_dispatcher.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 CONTENT_RENDERER_VR_DISPATCHER_H_ 5 #ifndef CONTENT_RENDERER_VR_DISPATCHER_H_
6 #define CONTENT_RENDERER_VR_DISPATCHER_H_ 6 #define CONTENT_RENDERER_VR_DISPATCHER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/id_map.h" 10 #include "base/id_map.h"
11 #include "content/common/vr_service.mojom.h" 11 #include "content/common/vr_service.mojom.h"
12 #include "third_party/WebKit/public/platform/WebVector.h" 12 #include "third_party/WebKit/public/platform/WebVector.h"
13 #include "third_party/WebKit/public/platform/modules/vr/WebVR.h" 13 #include "third_party/WebKit/public/platform/modules/vr/WebVR.h"
14 #include "third_party/WebKit/public/platform/modules/vr/WebVRClient.h" 14 #include "third_party/WebKit/public/platform/modules/vr/WebVRClient.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 class ServiceRegistry; 18 class ServiceRegistry;
19 19
20 class VRDispatcher : NON_EXPORTED_BASE(public blink::WebVRClient) { 20 class VRDispatcher : NON_EXPORTED_BASE(public blink::WebVRClient) {
21 public: 21 public:
22 explicit VRDispatcher(ServiceRegistry* service_registry); 22 explicit VRDispatcher(ServiceRegistry* service_registry);
23 ~VRDispatcher() override; 23 ~VRDispatcher();
24 24
25 // blink::WebVRClient implementation. 25 // blink::WebVRClient implementation.
26 void getDevices(blink::WebVRGetDevicesCallback* callback) override; 26 void getDevices(blink::WebVRGetDevicesCallback* callback) override;
27 27
28 void getSensorState(unsigned int index, 28 void getSensorState(unsigned int index,
29 blink::WebHMDSensorState& state) override; 29 blink::WebHMDSensorState& state) override;
30 30
31 void resetSensor(unsigned int index) override; 31 void resetSensor(unsigned int index) override;
32 32
33 private: 33 private:
(...skipping 12 matching lines...) Expand all
46 46
47 ServiceRegistry* service_registry_; 47 ServiceRegistry* service_registry_;
48 VRServicePtr vr_service_; 48 VRServicePtr vr_service_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(VRDispatcher); 50 DISALLOW_COPY_AND_ASSIGN(VRDispatcher);
51 }; 51 };
52 52
53 } // namespace content 53 } // namespace content
54 54
55 #endif // CONTENT_RENDERER_VR_DISPATCHER_H_ 55 #endif // CONTENT_RENDERER_VR_DISPATCHER_H_
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/wake_lock/wake_lock_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698