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

Side by Side Diff: media/base/android/android_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/android/access_unit_queue.h ('k') | media/base/android/audio_decoder_job.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_ANDROID_ANDROID_CDM_FACTORY_H_ 5 #ifndef MEDIA_BASE_ANDROID_ANDROID_CDM_FACTORY_H_
6 #define MEDIA_BASE_ANDROID_ANDROID_CDM_FACTORY_H_ 6 #define MEDIA_BASE_ANDROID_ANDROID_CDM_FACTORY_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "media/base/android/provision_fetcher.h" 9 #include "media/base/android/provision_fetcher.h"
11 #include "media/base/cdm_factory.h" 10 #include "media/base/cdm_factory.h"
12 #include "media/base/media_export.h" 11 #include "media/base/media_export.h"
13 12
14 namespace media { 13 namespace media {
15 14
16 struct CdmConfig; 15 struct CdmConfig;
17 16
18 class MEDIA_EXPORT AndroidCdmFactory : public CdmFactory { 17 class MEDIA_EXPORT AndroidCdmFactory : public CdmFactory {
19 public: 18 public:
(...skipping 13 matching lines...) Expand all
33 32
34 private: 33 private:
35 CreateFetcherCB create_fetcher_cb_; 34 CreateFetcherCB create_fetcher_cb_;
36 35
37 DISALLOW_COPY_AND_ASSIGN(AndroidCdmFactory); 36 DISALLOW_COPY_AND_ASSIGN(AndroidCdmFactory);
38 }; 37 };
39 38
40 } // namespace media 39 } // namespace media
41 40
42 #endif // MEDIA_BASE_ANDROID_ANDROID_CDM_FACTORY_H_ 41 #endif // MEDIA_BASE_ANDROID_ANDROID_CDM_FACTORY_H_
OLDNEW
« no previous file with comments | « media/base/android/access_unit_queue.h ('k') | media/base/android/audio_decoder_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698