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: media/base/android/media_drm_bridge.h

Issue 2444683002: Move MediaKeys::Exception to CdmPromise::Exception (Closed)
Patch Set: include "media/base/media_keys.h" Created 4 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/android/scoped_java_ref.h" 15 #include "base/android/scoped_java_ref.h"
16 #include "base/callback.h" 16 #include "base/callback.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/memory/weak_ptr.h" 18 #include "base/memory/weak_ptr.h"
19 #include "media/base/android/media_drm_bridge_cdm_context.h" 19 #include "media/base/android/media_drm_bridge_cdm_context.h"
20 #include "media/base/android/provision_fetcher.h" 20 #include "media/base/android/provision_fetcher.h"
21 #include "media/base/cdm_promise.h"
21 #include "media/base/cdm_promise_adapter.h" 22 #include "media/base/cdm_promise_adapter.h"
22 #include "media/base/media_export.h" 23 #include "media/base/media_export.h"
23 #include "media/base/media_keys.h" 24 #include "media/base/media_keys.h"
24 #include "media/base/player_tracker.h" 25 #include "media/base/player_tracker.h"
25 #include "media/cdm/player_tracker_impl.h" 26 #include "media/cdm/player_tracker_impl.h"
26 #include "url/gurl.h" 27 #include "url/gurl.h"
27 28
28 class GURL; 29 class GURL;
29 30
30 namespace media { 31 namespace media {
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 313
313 // NOTE: Weak pointers must be invalidated before all other member variables. 314 // NOTE: Weak pointers must be invalidated before all other member variables.
314 base::WeakPtrFactory<MediaDrmBridge> weak_factory_; 315 base::WeakPtrFactory<MediaDrmBridge> weak_factory_;
315 316
316 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge); 317 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
317 }; 318 };
318 319
319 } // namespace media 320 } // namespace media
320 321
321 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 322 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
OLDNEW
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698