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

Side by Side Diff: media/blink/webcontentdecryptionmodulesession_impl.cc

Issue 1921823003: media: Move key_system_names to media/base/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « media/base/key_systems.cc ('k') | media/cdm/key_system_names.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 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 #include "webcontentdecryptionmodulesession_impl.h" 5 #include "webcontentdecryptionmodulesession_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/numerics/safe_conversions.h" 10 #include "base/numerics/safe_conversions.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "media/base/cdm_key_information.h" 13 #include "media/base/cdm_key_information.h"
14 #include "media/base/cdm_promise.h" 14 #include "media/base/cdm_promise.h"
15 #include "media/base/key_system_names.h"
15 #include "media/base/key_systems.h" 16 #include "media/base/key_systems.h"
16 #include "media/base/limits.h" 17 #include "media/base/limits.h"
17 #include "media/base/media_keys.h" 18 #include "media/base/media_keys.h"
18 #include "media/blink/cdm_result_promise.h" 19 #include "media/blink/cdm_result_promise.h"
19 #include "media/blink/cdm_session_adapter.h" 20 #include "media/blink/cdm_session_adapter.h"
20 #include "media/blink/webmediaplayer_util.h" 21 #include "media/blink/webmediaplayer_util.h"
21 #include "media/cdm/json_web_key.h" 22 #include "media/cdm/json_web_key.h"
22 #include "media/cdm/key_system_names.h"
23 #include "third_party/WebKit/public/platform/WebData.h" 23 #include "third_party/WebKit/public/platform/WebData.h"
24 #include "third_party/WebKit/public/platform/WebEncryptedMediaKeyInformation.h" 24 #include "third_party/WebKit/public/platform/WebEncryptedMediaKeyInformation.h"
25 #include "third_party/WebKit/public/platform/WebString.h" 25 #include "third_party/WebKit/public/platform/WebString.h"
26 #include "third_party/WebKit/public/platform/WebURL.h" 26 #include "third_party/WebKit/public/platform/WebURL.h"
27 #include "third_party/WebKit/public/platform/WebVector.h" 27 #include "third_party/WebKit/public/platform/WebVector.h"
28 28
29 #if defined(USE_PROPRIETARY_CODECS) 29 #if defined(USE_PROPRIETARY_CODECS)
30 #include "media/cdm/cenc_utils.h" 30 #include "media/cdm/cenc_utils.h"
31 #endif 31 #endif
32 32
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 431
432 DCHECK(session_id_.empty()) << "Session ID may not be changed once set."; 432 DCHECK(session_id_.empty()) << "Session ID may not be changed once set.";
433 session_id_ = session_id; 433 session_id_ = session_id;
434 *status = 434 *status =
435 adapter_->RegisterSession(session_id_, weak_ptr_factory_.GetWeakPtr()) 435 adapter_->RegisterSession(session_id_, weak_ptr_factory_.GetWeakPtr())
436 ? SessionInitStatus::NEW_SESSION 436 ? SessionInitStatus::NEW_SESSION
437 : SessionInitStatus::SESSION_ALREADY_EXISTS; 437 : SessionInitStatus::SESSION_ALREADY_EXISTS;
438 } 438 }
439 439
440 } // namespace media 440 } // namespace media
OLDNEW
« no previous file with comments | « media/base/key_systems.cc ('k') | media/cdm/key_system_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698