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

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

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . Created 4 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 unified diff | Download patch
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | media/mojo/services/main.cc » ('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 #include "media/mojo/services/mojo_media_client.h" 5 #include "media/mojo/services/mojo_media_client.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "media/base/android/android_cdm_factory.h" 9 #include "media/base/android/android_cdm_factory.h"
10 #include "media/base/bind_to_current_loop.h" 10 #include "media/base/bind_to_current_loop.h"
11 #include "media/base/media.h" 11 #include "media/base/media.h"
12 #include "media/mojo/interfaces/provision_fetcher.mojom.h" 12 #include "media/mojo/interfaces/provision_fetcher.mojom.h"
13 #include "media/mojo/services/mojo_provision_fetcher.h" 13 #include "media/mojo/services/mojo_provision_fetcher.h"
14 #include "mojo/application/public/cpp/connect.h" 14 #include "mojo/shell/public/cpp/connect.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 namespace { 18 namespace {
19 scoped_ptr<ProvisionFetcher> CreateProvisionFetcher( 19 scoped_ptr<ProvisionFetcher> CreateProvisionFetcher(
20 mojo::ServiceProvider* service_provider) { 20 mojo::ServiceProvider* service_provider) {
21 interfaces::ProvisionFetcherPtr provision_fetcher_ptr; 21 interfaces::ProvisionFetcherPtr provision_fetcher_ptr;
22 mojo::ConnectToService(service_provider, &provision_fetcher_ptr); 22 mojo::ConnectToService(service_provider, &provision_fetcher_ptr);
23 return make_scoped_ptr( 23 return make_scoped_ptr(
24 new MojoProvisionFetcher(std::move(provision_fetcher_ptr))); 24 new MojoProvisionFetcher(std::move(provision_fetcher_ptr)));
(...skipping 13 matching lines...) Expand all
38 private: 38 private:
39 DISALLOW_COPY_AND_ASSIGN(AndroidMojoMediaClient); 39 DISALLOW_COPY_AND_ASSIGN(AndroidMojoMediaClient);
40 }; 40 };
41 } // namespace (anonymous) 41 } // namespace (anonymous)
42 42
43 scoped_ptr<MojoMediaClient> MojoMediaClient::Create() { 43 scoped_ptr<MojoMediaClient> MojoMediaClient::Create() {
44 return make_scoped_ptr(new AndroidMojoMediaClient()); 44 return make_scoped_ptr(new AndroidMojoMediaClient());
45 } 45 }
46 46
47 } // namespace media 47 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | media/mojo/services/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698