OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_ | 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_ |
6 #define CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_ | 6 #define CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
| 10 #include <memory> |
10 #include <vector> | 11 #include <vector> |
11 | 12 |
12 #include "base/callback_forward.h" | 13 #include "base/callback_forward.h" |
13 #include "base/macros.h" | 14 #include "base/macros.h" |
14 #include "base/memory/scoped_ptr.h" | |
15 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" |
16 #include "content/common/content_export.h" | 16 #include "content/common/content_export.h" |
17 #include "ppapi/c/dev/ppb_device_ref_dev.h" | 17 #include "ppapi/c/dev/ppb_device_ref_dev.h" |
18 #include "ppapi/host/host_message_context.h" | 18 #include "ppapi/host/host_message_context.h" |
19 #include "url/gurl.h" | 19 #include "url/gurl.h" |
20 | 20 |
21 namespace ppapi { | 21 namespace ppapi { |
22 struct DeviceRefData; | 22 struct DeviceRefData; |
23 | 23 |
24 namespace host { | 24 namespace host { |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 int request_id, | 94 int request_id, |
95 const std::vector<ppapi::DeviceRefData>& devices); | 95 const std::vector<ppapi::DeviceRefData>& devices); |
96 | 96 |
97 // Non-owning pointers. | 97 // Non-owning pointers. |
98 ppapi::host::ResourceHost* resource_host_; | 98 ppapi::host::ResourceHost* resource_host_; |
99 base::WeakPtr<Delegate> delegate_; | 99 base::WeakPtr<Delegate> delegate_; |
100 | 100 |
101 PP_DeviceType_Dev device_type_; | 101 PP_DeviceType_Dev device_type_; |
102 GURL document_url_; | 102 GURL document_url_; |
103 | 103 |
104 scoped_ptr<ScopedRequest> enumerate_; | 104 std::unique_ptr<ScopedRequest> enumerate_; |
105 scoped_ptr<ScopedRequest> monitor_; | 105 std::unique_ptr<ScopedRequest> monitor_; |
106 | 106 |
107 ppapi::host::ReplyMessageContext enumerate_devices_context_; | 107 ppapi::host::ReplyMessageContext enumerate_devices_context_; |
108 | 108 |
109 DISALLOW_COPY_AND_ASSIGN(PepperDeviceEnumerationHostHelper); | 109 DISALLOW_COPY_AND_ASSIGN(PepperDeviceEnumerationHostHelper); |
110 }; | 110 }; |
111 | 111 |
112 } // namespace content | 112 } // namespace content |
113 | 113 |
114 #endif // CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_ | 114 #endif // CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_HOST_HELPER_H_ |
OLD | NEW |