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

Side by Side Diff: media/remoting/proto_utils.h

Issue 2737513004: Fix media_mojo builds (Closed)
Patch Set: add export Created 3 years, 5 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/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 MEDIA_REMOTING_PROTO_UTILS_H_ 5 #ifndef MEDIA_REMOTING_PROTO_UTILS_H_
6 #define MEDIA_REMOTING_PROTO_UTILS_H_ 6 #define MEDIA_REMOTING_PROTO_UTILS_H_
7 7
8 #include <cstdint> 8 #include <cstdint>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "media/base/audio_decoder_config.h" 14 #include "media/base/audio_decoder_config.h"
15 #include "media/base/cdm_config.h" 15 #include "media/base/cdm_config.h"
16 #include "media/base/cdm_key_information.h" 16 #include "media/base/cdm_key_information.h"
17 #include "media/base/cdm_promise.h" 17 #include "media/base/cdm_promise.h"
18 #include "media/base/content_decryption_module.h"
18 #include "media/base/decoder_buffer.h" 19 #include "media/base/decoder_buffer.h"
19 #include "media/base/demuxer_stream.h" 20 #include "media/base/demuxer_stream.h"
20 #include "media/base/eme_constants.h" 21 #include "media/base/eme_constants.h"
21 #include "media/base/pipeline_status.h" 22 #include "media/base/pipeline_status.h"
22 #include "media/base/video_decoder_config.h" 23 #include "media/base/video_decoder_config.h"
23 #include "media/remoting/rpc.pb.h" 24 #include "media/remoting/rpc.pb.h"
24 25
25 namespace media { 26 namespace media {
26 namespace remoting { 27 namespace remoting {
27 28
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 bool success_; 125 bool success_;
125 CdmPromise::Exception exception_; 126 CdmPromise::Exception exception_;
126 uint32_t system_code_; 127 uint32_t system_code_;
127 std::string error_message_; 128 std::string error_message_;
128 }; 129 };
129 130
130 } // namespace remoting 131 } // namespace remoting
131 } // namespace media 132 } // namespace media
132 133
133 #endif // MEDIA_REMOTING_PROTO_UTILS_H_ 134 #endif // MEDIA_REMOTING_PROTO_UTILS_H_
OLDNEW
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698