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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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_renderer_impl.h ('k') | media/mojo/services/mojo_type_trait.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_SERVICE_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "media/base/audio_decoder_config.h" 14 #include "media/base/audio_decoder_config.h"
15 #include "media/base/buffering_state.h" 15 #include "media/base/buffering_state.h"
16 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
17 #include "media/base/pipeline_status.h" 17 #include "media/base/pipeline_status.h"
18 #include "media/mojo/interfaces/renderer.mojom.h" 18 #include "media/mojo/interfaces/renderer.mojom.h"
19 #include "media/mojo/services/mojo_cdm_service_context.h" 19 #include "media/mojo/services/mojo_cdm_service_context.h"
20 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" 20 #include "mojo/public/cpp/bindings/strong_binding.h"
21 21
22 namespace mojo { 22 namespace mojo {
23 class ApplicationConnection; 23 class ApplicationConnection;
24 } 24 }
25 25
26 namespace media { 26 namespace media {
27 27
28 class AudioRendererSink; 28 class AudioRendererSink;
29 class DemuxerStreamProviderShim; 29 class DemuxerStreamProviderShim;
30 class CdmContextProvider; 30 class CdmContextProvider;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 base::WeakPtr<MojoRendererService> weak_this_; 122 base::WeakPtr<MojoRendererService> weak_this_;
123 base::WeakPtrFactory<MojoRendererService> weak_factory_; 123 base::WeakPtrFactory<MojoRendererService> weak_factory_;
124 124
125 DISALLOW_COPY_AND_ASSIGN(MojoRendererService); 125 DISALLOW_COPY_AND_ASSIGN(MojoRendererService);
126 }; 126 };
127 127
128 } // namespace media 128 } // namespace media
129 129
130 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_ 130 #endif // MEDIA_MOJO_SERVICES_MOJO_RENDERER_SERVICE_H_
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.h ('k') | media/mojo/services/mojo_type_trait.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698