Chromium Code Reviews| 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 PPAPI_PROXY_DEVICE_ENUMERATION_RESOURCE_HELPER_H_ | 5 #ifndef PPAPI_PROXY_DEVICE_ENUMERATION_RESOURCE_HELPER_H_ |
| 6 #define PPAPI_PROXY_DEVICE_ENUMERATION_RESOURCE_HELPER_H_ | 6 #define PPAPI_PROXY_DEVICE_ENUMERATION_RESOURCE_HELPER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
|
bbudge
2016/04/06 21:01:20
#include <memory> ?
dcheng
2016/04/06 21:18:33
Done.
| |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
| 14 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
| 15 #include "ppapi/c/dev/ppb_device_ref_dev.h" | 15 #include "ppapi/c/dev/ppb_device_ref_dev.h" |
| 16 #include "ppapi/proxy/ppapi_proxy_export.h" | 16 #include "ppapi/proxy/ppapi_proxy_export.h" |
| 17 #include "ppapi/shared_impl/thread_aware_callback.h" | 17 #include "ppapi/shared_impl/thread_aware_callback.h" |
| 18 | 18 |
| 19 namespace IPC { | 19 namespace IPC { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 63 | 63 |
| 64 int32_t WriteToArrayOutput(const std::vector<DeviceRefData>& devices, | 64 int32_t WriteToArrayOutput(const std::vector<DeviceRefData>& devices, |
| 65 const PP_ArrayOutput& output); | 65 const PP_ArrayOutput& output); |
| 66 | 66 |
| 67 // Not owned by this object. | 67 // Not owned by this object. |
| 68 PluginResource* owner_; | 68 PluginResource* owner_; |
| 69 | 69 |
| 70 bool pending_enumerate_devices_; | 70 bool pending_enumerate_devices_; |
| 71 | 71 |
| 72 uint32_t monitor_callback_id_; | 72 uint32_t monitor_callback_id_; |
| 73 scoped_ptr<ThreadAwareCallback<PP_MonitorDeviceChangeCallback> > | 73 std::unique_ptr<ThreadAwareCallback<PP_MonitorDeviceChangeCallback>> |
| 74 monitor_callback_; | 74 monitor_callback_; |
| 75 void* monitor_user_data_; | 75 void* monitor_user_data_; |
| 76 | 76 |
| 77 DISALLOW_COPY_AND_ASSIGN(DeviceEnumerationResourceHelper); | 77 DISALLOW_COPY_AND_ASSIGN(DeviceEnumerationResourceHelper); |
| 78 }; | 78 }; |
| 79 | 79 |
| 80 } // namespace proxy | 80 } // namespace proxy |
| 81 } // namespace ppapi | 81 } // namespace ppapi |
| 82 | 82 |
| 83 #endif // PPAPI_PROXY_DEVICE_ENUMERATION_RESOURCE_HELPER_H_ | 83 #endif // PPAPI_PROXY_DEVICE_ENUMERATION_RESOURCE_HELPER_H_ |
| OLD | NEW |