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

Unified Diff: media/base/browser_cdm.h

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/browser_cdm.h
diff --git a/media/base/browser_cdm.h b/media/base/browser_cdm.h
deleted file mode 100644
index 5e4cb28b4d8d1aacc18c33157eec1781b8afe85b..0000000000000000000000000000000000000000
--- a/media/base/browser_cdm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2014 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_BROWSER_CDM_H_
-#define MEDIA_BASE_BROWSER_CDM_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "media/base/media_export.h"
-#include "media/base/media_keys.h"
-#include "media/base/player_tracker.h"
-
-namespace media {
-
-// Interface for browser side CDMs.
-class MEDIA_EXPORT BrowserCdm : public MediaKeys, public PlayerTracker {
- public:
- ~BrowserCdm() override;
-
- // Virtual destructor. For most subclasses we can delete on the caller thread.
- virtual void DeleteOnCorrectThread();
-
- protected:
- BrowserCdm();
-
- private:
- DISALLOW_COPY_AND_ASSIGN(BrowserCdm);
-};
-
-struct MEDIA_EXPORT BrowserCdmDeleter {
- inline void operator()(BrowserCdm* ptr) const {
- ptr->DeleteOnCorrectThread();
- }
-};
-
-using ScopedBrowserCdmPtr = scoped_ptr<BrowserCdm, BrowserCdmDeleter>;
-
-} // namespace media
-
-#endif // MEDIA_BASE_BROWSER_CDM_H_

Powered by Google App Engine
This is Rietveld 408576698