| OLD | NEW |
| 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 CONTENT_COMMON_GPU_MEDIA_MEDIA_SERVICE_H_ | 5 #ifndef CONTENT_COMMON_GPU_MEDIA_MEDIA_SERVICE_H_ |
| 6 #define CONTENT_COMMON_GPU_MEDIA_MEDIA_SERVICE_H_ | 6 #define CONTENT_COMMON_GPU_MEDIA_MEDIA_SERVICE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> |
| 11 |
| 10 #include "base/containers/scoped_ptr_hash_map.h" | 12 #include "base/containers/scoped_ptr_hash_map.h" |
| 11 #include "base/macros.h" | 13 #include "base/macros.h" |
| 12 #include "ipc/ipc_listener.h" | 14 #include "ipc/ipc_listener.h" |
| 13 #include "ipc/ipc_sender.h" | 15 #include "ipc/ipc_sender.h" |
| 14 #include "media/video/video_decode_accelerator.h" | 16 #include "media/video/video_decode_accelerator.h" |
| 15 | 17 |
| 16 namespace gpu { | 18 namespace gpu { |
| 17 class GpuChannel; | 19 class GpuChannel; |
| 18 class GpuChannelManager; | 20 class GpuChannelManager; |
| 19 } | 21 } |
| (...skipping 14 matching lines...) Expand all Loading... |
| 34 private: | 36 private: |
| 35 gpu::GpuChannelManager* const channel_manager_; | 37 gpu::GpuChannelManager* const channel_manager_; |
| 36 base::ScopedPtrHashMap<int32_t, std::unique_ptr<MediaChannel>> | 38 base::ScopedPtrHashMap<int32_t, std::unique_ptr<MediaChannel>> |
| 37 media_channels_; | 39 media_channels_; |
| 38 DISALLOW_COPY_AND_ASSIGN(MediaService); | 40 DISALLOW_COPY_AND_ASSIGN(MediaService); |
| 39 }; | 41 }; |
| 40 | 42 |
| 41 } // namespace content | 43 } // namespace content |
| 42 | 44 |
| 43 #endif // CONTENT_COMMON_GPU_MEDIA_MEDIA_SERVICE_H_ | 45 #endif // CONTENT_COMMON_GPU_MEDIA_MEDIA_SERVICE_H_ |
| OLD | NEW |