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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 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 unified diff | Download patch
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 #include "media/mojo/services/mojo_media_application.h" 5 #include "media/mojo/services/mojo_media_application.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "media/base/media_log.h" 9 #include "media/base/media_log.h"
10 #include "media/mojo/services/mojo_media_client.h" 10 #include "media/mojo/services/mojo_media_client.h"
11 #include "media/mojo/services/service_factory_impl.h" 11 #include "media/mojo/services/service_factory_impl.h"
12 #include "mojo/public/cpp/bindings/strong_binding.h" 12 #include "mojo/public/cpp/bindings/strong_binding.h"
13 #include "services/shell/public/cpp/connection.h" 13 #include "services/service_manager/public/cpp/connection.h"
14 #include "services/shell/public/cpp/connector.h" 14 #include "services/service_manager/public/cpp/connector.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 // TODO(xhwang): Hook up MediaLog when possible. 18 // TODO(xhwang): Hook up MediaLog when possible.
19 MojoMediaApplication::MojoMediaApplication( 19 MojoMediaApplication::MojoMediaApplication(
20 std::unique_ptr<MojoMediaClient> mojo_media_client, 20 std::unique_ptr<MojoMediaClient> mojo_media_client,
21 const base::Closure& quit_closure) 21 const base::Closure& quit_closure)
22 : mojo_media_client_(std::move(mojo_media_client)), 22 : mojo_media_client_(std::move(mojo_media_client)),
23 media_log_(new MediaLog()), 23 media_log_(new MediaLog()),
24 ref_factory_(quit_closure) { 24 ref_factory_(quit_closure) {
(...skipping 30 matching lines...) Expand all
55 return; 55 return;
56 56
57 mojo::MakeStrongBinding( 57 mojo::MakeStrongBinding(
58 base::MakeUnique<ServiceFactoryImpl>(std::move(remote_interfaces), 58 base::MakeUnique<ServiceFactoryImpl>(std::move(remote_interfaces),
59 media_log_, ref_factory_.CreateRef(), 59 media_log_, ref_factory_.CreateRef(),
60 mojo_media_client_.get()), 60 mojo_media_client_.get()),
61 std::move(request)); 61 std::move(request));
62 } 62 }
63 63
64 } // namespace media 64 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_media_application.h ('k') | media/mojo/services/mojo_media_application_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698