| Index: content/public/gpu/gpu_video_decode_accelerator_factory.h
|
| diff --git a/content/public/gpu/gpu_video_decode_accelerator_factory.h b/content/public/gpu/gpu_video_decode_accelerator_factory.h
|
| index 313306bdd36af0d05b4f74cf2af26e47130afa07..f54f89139daed676c889d0b838eb6bcbc1b3d89c 100644
|
| --- a/content/public/gpu/gpu_video_decode_accelerator_factory.h
|
| +++ b/content/public/gpu/gpu_video_decode_accelerator_factory.h
|
| @@ -25,9 +25,11 @@ class GLES2Decoder;
|
| }
|
| }
|
|
|
| -namespace content {
|
| -
|
| +namespace media {
|
| class GpuVideoDecodeAcceleratorFactoryImpl;
|
| +}
|
| +
|
| +namespace content {
|
|
|
| // This factory allows creation of VideoDecodeAccelerator implementations,
|
| // providing the most applicable VDA for current platform and given
|
| @@ -81,12 +83,14 @@ class CONTENT_EXPORT GpuVideoDecodeAcceleratorFactory {
|
|
|
| private:
|
| // TODO(posciak): This is temporary and will not be needed once
|
| - // GpuVideoDecodeAcceleratorFactoryImpl implements
|
| + // media::GpuVideoDecodeAcceleratorFactoryImpl implements
|
| // GpuVideoDecodeAcceleratorFactory, see crbug.com/597150 and related.
|
| GpuVideoDecodeAcceleratorFactory(
|
| - std::unique_ptr<GpuVideoDecodeAcceleratorFactoryImpl> gvdafactory_impl);
|
| + std::unique_ptr<media::GpuVideoDecodeAcceleratorFactoryImpl>
|
| + gvdafactory_impl);
|
|
|
| - std::unique_ptr<GpuVideoDecodeAcceleratorFactoryImpl> gvdafactory_impl_;
|
| + std::unique_ptr<media::GpuVideoDecodeAcceleratorFactoryImpl>
|
| + gvdafactory_impl_;
|
| };
|
|
|
| } // namespace content
|
|
|