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

Side by Side Diff: media/mojo/services/mojo_renderer_factory.h

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 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 | « media/media.gyp ('k') | media/mojo/services/mojo_renderer_factory.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_
7 7
8 #include "media/base/media_export.h" 8 #include "media/base/media_export.h"
9 #include "media/base/renderer_factory.h" 9 #include "media/base/renderer_factory.h"
10 #include "media/mojo/interfaces/media_renderer.mojom.h" 10 #include "media/mojo/interfaces/media_renderer.mojom.h"
(...skipping 15 matching lines...) Expand all
26 26
27 private: 27 private:
28 DISALLOW_COPY_AND_ASSIGN(ServiceProvider); 28 DISALLOW_COPY_AND_ASSIGN(ServiceProvider);
29 }; 29 };
30 30
31 explicit MojoRendererFactory(scoped_ptr<ServiceProvider> service_provider); 31 explicit MojoRendererFactory(scoped_ptr<ServiceProvider> service_provider);
32 ~MojoRendererFactory() final; 32 ~MojoRendererFactory() final;
33 33
34 scoped_ptr<Renderer> CreateRenderer( 34 scoped_ptr<Renderer> CreateRenderer(
35 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 35 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
36 AudioRendererSink* audio_renderer_sink, 36 AudioRendererSink* audio_renderer_sink) final;
37 VideoRendererSink* video_renderer_sink) final;
38 37
39 private: 38 private:
40 scoped_ptr<ServiceProvider> service_provider_; 39 scoped_ptr<ServiceProvider> service_provider_;
41 40
42 DISALLOW_COPY_AND_ASSIGN(MojoRendererFactory); 41 DISALLOW_COPY_AND_ASSIGN(MojoRendererFactory);
43 }; 42 };
44 43
45 } // namespace media 44 } // namespace media
46 45
47 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_ 46 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_FACTORY_H_
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | media/mojo/services/mojo_renderer_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698