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

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

Issue 1311613002: Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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/mojo/services/mojo_cdm.h ('k') | mojo/application/public/cpp/application_impl.h » ('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_IMPL_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "media/base/renderer.h" 10 #include "media/base/renderer.h"
11 #include "media/mojo/interfaces/renderer.mojom.h" 11 #include "media/mojo/interfaces/renderer.mojom.h"
12 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
13 12
14 namespace base { 13 namespace base {
15 class SingleThreadTaskRunner; 14 class SingleThreadTaskRunner;
16 } 15 }
17 16
18 namespace media { 17 namespace media {
19 18
20 class DemuxerStreamProvider; 19 class DemuxerStreamProvider;
21 20
22 // A media::Renderer that proxies to a interfaces::Renderer. That 21 // A media::Renderer that proxies to a interfaces::Renderer. That
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 base::TimeDelta max_time_; 82 base::TimeDelta max_time_;
84 83
85 base::WeakPtrFactory<MojoRendererImpl> weak_factory_; 84 base::WeakPtrFactory<MojoRendererImpl> weak_factory_;
86 85
87 DISALLOW_COPY_AND_ASSIGN(MojoRendererImpl); 86 DISALLOW_COPY_AND_ASSIGN(MojoRendererImpl);
88 }; 87 };
89 88
90 } // namespace media 89 } // namespace media
91 90
92 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_ 91 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_IMPL_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm.h ('k') | mojo/application/public/cpp/application_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698