| Index: media/mojo/services/default_mojo_media_application.cc
|
| diff --git a/media/mojo/services/default_mojo_media_client.cc b/media/mojo/services/default_mojo_media_application.cc
|
| similarity index 92%
|
| rename from media/mojo/services/default_mojo_media_client.cc
|
| rename to media/mojo/services/default_mojo_media_application.cc
|
| index 661addd1bb6baa6b40f09c01133f14654ed11939..bdd42dc0f32f98fe43f952939685b3621198845e 100644
|
| --- a/media/mojo/services/default_mojo_media_client.cc
|
| +++ b/media/mojo/services/default_mojo_media_application.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "media/mojo/services/mojo_media_client.h"
|
| +#include "media/mojo/services/mojo_media_application.h"
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -13,6 +13,7 @@
|
| #include "media/base/media.h"
|
| #include "media/base/null_video_sink.h"
|
| #include "media/cdm/default_cdm_factory.h"
|
| +#include "media/mojo/services/mojo_media_client.h"
|
| #include "media/renderers/default_renderer_factory.h"
|
| #include "media/renderers/gpu_video_accelerator_factories.h"
|
|
|
| @@ -82,8 +83,10 @@ class DefaultMojoMediaClient : public MojoMediaClient {
|
|
|
| } // namespace (anonymous)
|
|
|
| -scoped_ptr<MojoMediaClient> MojoMediaClient::Create() {
|
| - return make_scoped_ptr(new DefaultMojoMediaClient());
|
| +// static
|
| +scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() {
|
| + return make_scoped_ptr(
|
| + new MojoMediaApplication(make_scoped_ptr(new DefaultMojoMediaClient())));
|
| }
|
|
|
| } // namespace media
|
|
|