diff options
| author | jam <jam@chromium.org> | 2015-05-19 20:37:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-20 03:37:14 +0000 |
| commit | 0080299638e998a7cb9cdd3f5aadcf6b6ffe707b (patch) | |
| tree | 2476a2f51b918e511427e219f38717d4a56fc16c /media/mojo/services/mojo_media_application.cc | |
| parent | 52eb6dd02c535873dda638dcd5e08e1fc7af5538 (diff) | |
| download | chromium_src-0080299638e998a7cb9cdd3f5aadcf6b6ffe707b.zip chromium_src-0080299638e998a7cb9cdd3f5aadcf6b6ffe707b.tar.gz chromium_src-0080299638e998a7cb9cdd3f5aadcf6b6ffe707b.tar.bz2 | |
Remove duplicate application cpp files in mojo/application.
Some of these files were forked in the initial Mandoline landing. After we forked the application code, we now had two implementations of some of these files. We only need one.
Review URL: https://codereview.chromium.org/1142323003
Cr-Commit-Position: refs/heads/master@{#330690}
Diffstat (limited to 'media/mojo/services/mojo_media_application.cc')
| -rw-r--r-- | media/mojo/services/mojo_media_application.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc index 7aeaabc..4cd7204 100644 --- a/media/mojo/services/mojo_media_application.cc +++ b/media/mojo/services/mojo_media_application.cc @@ -4,10 +4,10 @@ #include "base/logging.h" #include "media/mojo/services/mojo_renderer_service.h" -#include "mojo/application/application_runner_chromium.h" #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_delegate.h" #include "mojo/application/public/cpp/application_impl.h" +#include "mojo/application/public/cpp/application_runner.h" #include "mojo/application/public/cpp/interface_factory_impl.h" #include "third_party/mojo/src/mojo/public/c/system/main.h" @@ -42,6 +42,6 @@ class MojoMediaApplication } // namespace media MojoResult MojoMain(MojoHandle mojo_handle) { - mojo::ApplicationRunnerChromium runner(new media::MojoMediaApplication()); + mojo::ApplicationRunner runner(new media::MojoMediaApplication()); return runner.Run(mojo_handle); } |