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

Unified Diff: media/base/cdm_promise.h

Issue 836783004: media: Handle promise resolve/rejection in CdmPromiseAdapter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
Index: media/base/cdm_promise.h
diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h
index f8ba2196cc691a6df018727bfb56433e4ec121f0..93515477dade35482f4e346d1d8a8b0a17fd8a68 100644
--- a/media/base/cdm_promise.h
+++ b/media/base/cdm_promise.h
@@ -57,8 +57,6 @@ class MEDIA_EXPORT CdmPromise {
// For some reason the Windows compiler is not happy with the implementation
// of CdmPromiseTemplate being in the .cc file, so moving it here.
-namespace {
-
template <typename... T>
struct CdmPromiseTraits {};
@@ -72,8 +70,6 @@ struct CdmPromiseTraits<std::string> {
static const CdmPromise::ResolveParameterType kType = CdmPromise::STRING_TYPE;
};
-} // namespace
-
// This class adds the resolve(T) method. This class is still an interface, and
// is used as the type of promise that gets passed around.
template <typename... T>

Powered by Google App Engine
This is Rietveld 408576698