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

Side by Side Diff: media/blink/new_session_cdm_result_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/blink/mock_weburlloader.h ('k') | media/blink/test_response_generator.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_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ 5 #ifndef MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_
6 #define MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ 6 #define MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h"
10 #include "media/base/cdm_promise.h" 11 #include "media/base/cdm_promise.h"
11 #include "media/base/media_keys.h" 12 #include "media/base/media_keys.h"
12 #include "media/blink/media_blink_export.h" 13 #include "media/blink/media_blink_export.h"
13 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" 14 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
14 15
15 namespace media { 16 namespace media {
16 17
17 enum class SessionInitStatus { 18 enum class SessionInitStatus {
18 // Error creating the session. 19 // Error creating the session.
19 UNKNOWN_STATUS, 20 UNKNOWN_STATUS,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // Called on resolve() to convert the session ID into a SessionInitStatus to 61 // Called on resolve() to convert the session ID into a SessionInitStatus to
61 // be reported to blink. 62 // be reported to blink.
62 SessionInitializedCB new_session_created_cb_; 63 SessionInitializedCB new_session_created_cb_;
63 64
64 DISALLOW_COPY_AND_ASSIGN(NewSessionCdmResultPromise); 65 DISALLOW_COPY_AND_ASSIGN(NewSessionCdmResultPromise);
65 }; 66 };
66 67
67 } // namespace media 68 } // namespace media
68 69
69 #endif // MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_ 70 #endif // MEDIA_BLINK_NEW_SESSION_CDM_RESULT_PROMISE_H_
OLDNEW
« no previous file with comments | « media/blink/mock_weburlloader.h ('k') | media/blink/test_response_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698