| OLD | NEW |
| 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 "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "media/base/media_log.h" | 8 #include "media/base/media_log.h" |
| 9 #include "media/mojo/services/service_factory_impl.h" | 9 #include "media/mojo/services/service_factory_impl.h" |
| 10 #include "mojo/application/public/cpp/application_connection.h" | 10 #include "mojo/application/public/cpp/application_connection.h" |
| 11 #include "mojo/application/public/cpp/application_impl.h" | 11 #include "mojo/application/public/cpp/application_impl.h" |
| 12 | 12 |
| 13 namespace media { | 13 namespace media { |
| 14 | 14 |
| 15 const char kMojoMediaAppUrl[] = "mojo:media"; | |
| 16 | |
| 17 // static | |
| 18 GURL MojoMediaApplication::AppUrl() { | |
| 19 return GURL(kMojoMediaAppUrl); | |
| 20 } | |
| 21 | |
| 22 // static | 15 // static |
| 23 scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() { | 16 scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() { |
| 24 return scoped_ptr<mojo::ApplicationDelegate>(new MojoMediaApplication()); | 17 return scoped_ptr<mojo::ApplicationDelegate>(new MojoMediaApplication()); |
| 25 } | 18 } |
| 26 | 19 |
| 27 // TODO(xhwang): Hook up MediaLog when possible. | 20 // TODO(xhwang): Hook up MediaLog when possible. |
| 28 MojoMediaApplication::MojoMediaApplication() | 21 MojoMediaApplication::MojoMediaApplication() |
| 29 : app_impl_(nullptr), media_log_(new MediaLog()) {} | 22 : app_impl_(nullptr), media_log_(new MediaLog()) {} |
| 30 | 23 |
| 31 MojoMediaApplication::~MojoMediaApplication() { | 24 MojoMediaApplication::~MojoMediaApplication() { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 50 void MojoMediaApplication::Create( | 43 void MojoMediaApplication::Create( |
| 51 mojo::ApplicationConnection* connection, | 44 mojo::ApplicationConnection* connection, |
| 52 mojo::InterfaceRequest<interfaces::ServiceFactory> request) { | 45 mojo::InterfaceRequest<interfaces::ServiceFactory> request) { |
| 53 // The created object is owned by the pipe. | 46 // The created object is owned by the pipe. |
| 54 new ServiceFactoryImpl(request.Pass(), connection->GetServiceProvider(), | 47 new ServiceFactoryImpl(request.Pass(), connection->GetServiceProvider(), |
| 55 media_log_, | 48 media_log_, |
| 56 app_impl_->app_lifetime_helper()->CreateAppRefCount()); | 49 app_impl_->app_lifetime_helper()->CreateAppRefCount()); |
| 57 } | 50 } |
| 58 | 51 |
| 59 } // namespace media | 52 } // namespace media |
| OLD | NEW |