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

Side by Side Diff: content/browser/media/android/browser_media_player_manager.h

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more trybot issue Created 6 years, 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/scoped_vector.h" 16 #include "base/memory/scoped_vector.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "content/browser/android/content_video_view.h" 18 #include "content/browser/android/content_video_view.h"
19 #include "content/common/content_export.h" 19 #include "content/common/content_export.h"
20 #include "content/common/media/cdm_messages_enums.h" 20 #include "content/common/media/cdm_messages_enums.h"
21 #include "content/common/media/media_player_messages_enums_android.h" 21 #include "content/common/media/media_player_messages_enums_android.h"
22 #include "ipc/ipc_message.h" 22 #include "ipc/ipc_message.h"
23 #include "media/base/android/media_player_android.h" 23 #include "media/base/android/media_player_android.h"
24 #include "media/base/android/media_player_manager.h" 24 #include "media/base/android/media_player_manager.h"
25 #include "media/base/media_keys.h"
25 #include "ui/gfx/rect_f.h" 26 #include "ui/gfx/rect_f.h"
26 #include "url/gurl.h" 27 #include "url/gurl.h"
27 28
28 namespace media { 29 namespace media {
29 class BrowserCdm; 30 class BrowserCdm;
30 class DemuxerAndroid; 31 class DemuxerAndroid;
31 } 32 }
32 33
33 namespace content { 34 namespace content {
34 class BrowserDemuxerAndroid; 35 class BrowserDemuxerAndroid;
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 257
257 // NOTE: Weak pointers must be invalidated before all other member variables. 258 // NOTE: Weak pointers must be invalidated before all other member variables.
258 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; 259 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
259 260
260 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); 261 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
261 }; 262 };
262 263
263 } // namespace content 264 } // namespace content
264 265
265 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 266 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | content/renderer/media/cdm_session_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698