Chromium Code Reviews| 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 "base/memory/ref_counted.h" | 5 #include "base/memory/ref_counted.h" |
| 6 #include "media/mojo/interfaces/service_factory.mojom.h" | 6 #include "media/mojo/interfaces/service_factory.mojom.h" |
| 7 #include "mojo/application/public/cpp/application_delegate.h" | 7 #include "mojo/application/public/cpp/application_delegate.h" |
| 8 #include "mojo/application/public/cpp/interface_factory_impl.h" | 8 #include "mojo/application/public/cpp/interface_factory_impl.h" |
| 9 #include "url/gurl.h" | 9 #include "url/gurl.h" |
| 10 | 10 |
| 11 namespace media { | 11 namespace media { |
| 12 | 12 |
| 13 class MediaLog; | 13 class MediaLog; |
| 14 class MojoMediaClient; | |
| 14 | 15 |
| 15 class MojoMediaApplication | 16 class MojoMediaApplication |
| 16 : public mojo::ApplicationDelegate, | 17 : public mojo::ApplicationDelegate, |
| 17 public mojo::InterfaceFactory<interfaces::ServiceFactory> { | 18 public mojo::InterfaceFactory<interfaces::ServiceFactory> { |
| 18 public: | 19 public: |
| 19 static scoped_ptr<mojo::ApplicationDelegate> CreateApp(); | 20 static scoped_ptr<mojo::ApplicationDelegate> CreateApp(); |
| 20 | 21 |
| 21 explicit MojoMediaApplication(bool enable_logging); | 22 explicit MojoMediaApplication(bool enable_logging, |
|
xhwang
2015/12/16 21:30:31
remove explicit
alokp
2015/12/16 22:57:29
Done.
| |
| 23 scoped_ptr<MojoMediaClient> media_client); | |
| 22 ~MojoMediaApplication() final; | 24 ~MojoMediaApplication() final; |
| 23 | 25 |
| 24 private: | 26 private: |
| 25 // mojo::ApplicationDelegate implementation. | 27 // mojo::ApplicationDelegate implementation. |
| 26 void Initialize(mojo::ApplicationImpl* app) final; | 28 void Initialize(mojo::ApplicationImpl* app) final; |
| 27 bool ConfigureIncomingConnection( | 29 bool ConfigureIncomingConnection( |
| 28 mojo::ApplicationConnection* connection) final; | 30 mojo::ApplicationConnection* connection) final; |
| 29 | 31 |
| 30 // mojo::InterfaceFactory<interfaces::ServiceFactory> implementation. | 32 // mojo::InterfaceFactory<interfaces::ServiceFactory> implementation. |
| 31 void Create(mojo::ApplicationConnection* connection, | 33 void Create(mojo::ApplicationConnection* connection, |
| 32 mojo::InterfaceRequest<interfaces::ServiceFactory> request) final; | 34 mojo::InterfaceRequest<interfaces::ServiceFactory> request) final; |
| 33 | 35 |
| 34 bool enable_logging_; | 36 bool enable_logging_; |
| 37 scoped_ptr<MojoMediaClient> media_client_; | |
|
xhwang
2015/12/16 21:30:31
s/media_client_/mojo_media_client_ since we have a
alokp
2015/12/16 22:57:29
Done. Although this is a private member variable.
| |
| 35 mojo::ApplicationImpl* app_impl_; | 38 mojo::ApplicationImpl* app_impl_; |
| 36 scoped_refptr<MediaLog> media_log_; | 39 scoped_refptr<MediaLog> media_log_; |
| 37 }; | 40 }; |
| 38 | 41 |
| 39 } // namespace media | 42 } // namespace media |
| OLD | NEW |