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

Side by Side Diff: media/base/cdm_factory.h

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: android 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/byte_queue.cc ('k') | media/base/cdm_promise_adapter.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef MEDIA_BASE_CDM_FACTORY_H_ 5 #ifndef MEDIA_BASE_CDM_FACTORY_H_
6 #define MEDIA_BASE_CDM_FACTORY_H_ 6 #define MEDIA_BASE_CDM_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "media/base/media_export.h" 11 #include "media/base/media_export.h"
13 #include "media/base/media_keys.h" 12 #include "media/base/media_keys.h"
14 13
15 class GURL; 14 class GURL;
16 15
17 namespace media { 16 namespace media {
18 17
19 // Callback used when CDM is created. |error_message| only used if 18 // Callback used when CDM is created. |error_message| only used if
20 // MediaKeys is null (i.e. CDM can't be created). 19 // MediaKeys is null (i.e. CDM can't be created).
21 using CdmCreatedCB = base::Callback<void(const scoped_refptr<MediaKeys>&, 20 using CdmCreatedCB = base::Callback<void(const scoped_refptr<MediaKeys>&,
(...skipping 19 matching lines...) Expand all
41 const SessionExpirationUpdateCB& session_expiration_update_cb, 40 const SessionExpirationUpdateCB& session_expiration_update_cb,
42 const CdmCreatedCB& cdm_created_cb) = 0; 41 const CdmCreatedCB& cdm_created_cb) = 0;
43 42
44 private: 43 private:
45 DISALLOW_COPY_AND_ASSIGN(CdmFactory); 44 DISALLOW_COPY_AND_ASSIGN(CdmFactory);
46 }; 45 };
47 46
48 } // namespace media 47 } // namespace media
49 48
50 #endif // MEDIA_BASE_CDM_FACTORY_H_ 49 #endif // MEDIA_BASE_CDM_FACTORY_H_
OLDNEW
« no previous file with comments | « media/base/byte_queue.cc ('k') | media/base/cdm_promise_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698