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

Side by Side Diff: content/browser/vr/android/cardboard/cardboard_vr_device_provider.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « content/browser/utility_process_host_impl.h ('k') | content/browser/vr/vr_device_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 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_BROWSER_VR_CARDBOARD_VR_DEVICE_PROVIDER_H 5 #ifndef CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_PROVIDER_H
6 #define CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_PROVIDER_H 6 #define CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_PROVIDER_H
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "content/browser/vr/vr_device.h" 12 #include "content/browser/vr/vr_device.h"
13 #include "content/browser/vr/vr_device_provider.h" 13 #include "content/browser/vr/vr_device_provider.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 class CardboardVRDeviceProvider : public VRDeviceProvider { 17 class CardboardVRDeviceProvider : public VRDeviceProvider {
18 public: 18 public:
19 CardboardVRDeviceProvider(); 19 CardboardVRDeviceProvider();
20 ~CardboardVRDeviceProvider() override; 20 ~CardboardVRDeviceProvider() override;
21 21
22 void GetDevices(std::vector<VRDevice*>* devices) override; 22 void GetDevices(std::vector<VRDevice*>* devices) override;
23 void Initialize() override; 23 void Initialize() override;
24 24
25 private: 25 private:
26 scoped_ptr<VRDevice> cardboard_device_; 26 std::unique_ptr<VRDevice> cardboard_device_;
27 27
28 DISALLOW_COPY_AND_ASSIGN(CardboardVRDeviceProvider); 28 DISALLOW_COPY_AND_ASSIGN(CardboardVRDeviceProvider);
29 }; 29 };
30 30
31 } // namespace content 31 } // namespace content
32 32
33 #endif // CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_PROVIDER_H 33 #endif // CONTENT_BROWSER_VR_CARDBOARD_VR_DEVICE_PROVIDER_H
OLDNEW
« no previous file with comments | « content/browser/utility_process_host_impl.h ('k') | content/browser/vr/vr_device_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698