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

Side by Side Diff: media/mojo/services/android_mojo_media_client.cc

Issue 1408793009: media: Remove BrowserCdmFactory inferface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment for DEPS change. Created 5 years, 1 month 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/media.gyp ('k') | no next file » | 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 #include "media/mojo/services/mojo_media_client.h" 5 #include "media/mojo/services/mojo_media_client.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "media/base/android/android_cdm_factory.h"
8 #include "media/base/media.h" 9 #include "media/base/media.h"
9 #include "media/cdm/android_cdm_factory.h"
10 10
11 namespace media { 11 namespace media {
12 namespace internal { 12 namespace internal {
13 13
14 class AndroidMojoMediaClient : public PlatformMojoMediaClient { 14 class AndroidMojoMediaClient : public PlatformMojoMediaClient {
15 public: 15 public:
16 AndroidMojoMediaClient() {} 16 AndroidMojoMediaClient() {}
17 17
18 scoped_ptr<CdmFactory> CreateCdmFactory() override { 18 scoped_ptr<CdmFactory> CreateCdmFactory() override {
19 return make_scoped_ptr(new AndroidCdmFactory()); 19 return make_scoped_ptr(new AndroidCdmFactory());
20 } 20 }
21 21
22 private: 22 private:
23 DISALLOW_COPY_AND_ASSIGN(AndroidMojoMediaClient); 23 DISALLOW_COPY_AND_ASSIGN(AndroidMojoMediaClient);
24 }; 24 };
25 25
26 scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient() { 26 scoped_ptr<PlatformMojoMediaClient> CreatePlatformMojoMediaClient() {
27 return make_scoped_ptr(new AndroidMojoMediaClient()); 27 return make_scoped_ptr(new AndroidMojoMediaClient());
28 } 28 }
29 29
30 } // namespace internal 30 } // namespace internal
31 } // namespace media 31 } // namespace media
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698