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

Unified Diff: components/cdm/common/widevine_drm_delegate_android.cc

Issue 1934193003: media: Set MediaClientAndroid in the GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 8 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 | « components/cdm/common/widevine_drm_delegate_android.h ('k') | content/gpu/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cdm/common/widevine_drm_delegate_android.cc
diff --git a/components/cdm/browser/widevine_drm_delegate_android.cc b/components/cdm/common/widevine_drm_delegate_android.cc
similarity index 78%
rename from components/cdm/browser/widevine_drm_delegate_android.cc
rename to components/cdm/common/widevine_drm_delegate_android.cc
index d2e7f67bf69012e6037137913d9e70a91e6c0ba5..d8e0f4391269f302d1016057aec9e516d68562b7 100644
--- a/components/cdm/browser/widevine_drm_delegate_android.cc
+++ b/components/cdm/common/widevine_drm_delegate_android.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/cdm/browser/widevine_drm_delegate_android.h"
+#include "components/cdm/common/widevine_drm_delegate_android.h"
#include "base/macros.h"
#include "media/cdm/cenc_utils.h"
@@ -12,16 +12,14 @@ namespace cdm {
namespace {
const uint8_t kWidevineUuid[16] = {
- 0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
- 0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
+ 0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE, //
+ 0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED};
} // namespace
-WidevineDrmDelegateAndroid::WidevineDrmDelegateAndroid() {
-}
+WidevineDrmDelegateAndroid::WidevineDrmDelegateAndroid() {}
-WidevineDrmDelegateAndroid::~WidevineDrmDelegateAndroid() {
-}
+WidevineDrmDelegateAndroid::~WidevineDrmDelegateAndroid() {}
const std::vector<uint8_t> WidevineDrmDelegateAndroid::GetUUID() const {
return std::vector<uint8_t>(kWidevineUuid,
« no previous file with comments | « components/cdm/common/widevine_drm_delegate_android.h ('k') | content/gpu/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698