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

Side by Side Diff: media/base/cdm_callback_promise.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/base/byte_queue.h ('k') | media/base/cdm_factory.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_BASE_CDM_CALLBACK_PROMISE_H_ 5 #ifndef MEDIA_BASE_CDM_CALLBACK_PROMISE_H_
6 #define MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ 6 #define MEDIA_BASE_CDM_CALLBACK_PROMISE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/macros.h"
11 #include "media/base/cdm_promise.h" 12 #include "media/base/cdm_promise.h"
12 #include "media/base/media_export.h" 13 #include "media/base/media_export.h"
13 #include "media/base/media_keys.h" 14 #include "media/base/media_keys.h"
14 15
15 namespace media { 16 namespace media {
16 17
17 typedef base::Callback<void(MediaKeys::Exception exception_code, 18 typedef base::Callback<void(MediaKeys::Exception exception_code,
18 uint32_t system_code, 19 uint32_t system_code,
19 const std::string& error_message)> 20 const std::string& error_message)>
20 PromiseRejectedCB; 21 PromiseRejectedCB;
(...skipping 16 matching lines...) Expand all
37 38
38 base::Callback<void(const T&...)> resolve_cb_; 39 base::Callback<void(const T&...)> resolve_cb_;
39 PromiseRejectedCB reject_cb_; 40 PromiseRejectedCB reject_cb_;
40 41
41 DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise); 42 DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise);
42 }; 43 };
43 44
44 } // namespace media 45 } // namespace media
45 46
46 #endif // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ 47 #endif // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_
OLDNEW
« no previous file with comments | « media/base/byte_queue.h ('k') | media/base/cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698