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

Unified Diff: media/base/android/media_client_android.h

Issue 2756333002: Rename MediaClientAndroid to MediaDrmBridgeClient (Closed)
Patch Set: Fix .h guards Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/BUILD.gn ('k') | media/base/android/media_client_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_client_android.h
diff --git a/media/base/android/media_client_android.h b/media/base/android/media_client_android.h
deleted file mode 100644
index 909022bef0a6d1755e67ac76195f815a27fca007..0000000000000000000000000000000000000000
--- a/media/base/android/media_client_android.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_
-#define MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_
-
-#include <stdint.h>
-
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "base/containers/hash_tables.h"
-#include "base/macros.h"
-#include "media/base/media_export.h"
-
-namespace media {
-
-class MediaClientAndroid;
-class MediaDrmBridgeDelegate;
-
-// Setter for MediaClientAndroid. This should be called in all processes where
-// we want to run media Android code. Also it should be called before any media
-// playback could occur.
-MEDIA_EXPORT void SetMediaClientAndroid(MediaClientAndroid* media_client);
-
-#if defined(MEDIA_IMPLEMENTATION)
-// Getter for the client. Returns nullptr if no customized client is needed.
-MediaClientAndroid* GetMediaClientAndroid();
-#endif
-
-using UUID = std::vector<uint8_t>;
-
-// A client interface for embedders (e.g. content/browser or content/gpu) to
-// provide customized additions to Android's media handling.
-class MEDIA_EXPORT MediaClientAndroid {
- public:
- typedef base::hash_map<std::string, UUID> KeySystemUuidMap;
-
- MediaClientAndroid();
- virtual ~MediaClientAndroid();
-
- // Adds extra mappings from key-system name to Android UUID into |map|.
- virtual void AddKeySystemUUIDMappings(KeySystemUuidMap* map);
-
- // Returns a MediaDrmBridgeDelegate that corresponds to |scheme_uuid|.
- // MediaClientAndroid retains ownership.
- virtual media::MediaDrmBridgeDelegate* GetMediaDrmBridgeDelegate(
- const UUID& scheme_uuid);
-
- private:
- friend class KeySystemManager;
-
- DISALLOW_COPY_AND_ASSIGN(MediaClientAndroid);
-};
-
-} // namespace media
-
-#endif // MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_
« no previous file with comments | « media/base/android/BUILD.gn ('k') | media/base/android/media_client_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698