| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <deque> | 5 #include <deque> |
| 6 #include <iomanip> | 6 #include <iomanip> |
| 7 #include <iostream> | 7 #include <iostream> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 11 #include "examples/media_test/keystroke.h" | 11 #include "examples/media_test/keystroke.h" |
| 12 #include "examples/media_test/media_test.h" | 12 #include "examples/media_test/media_test.h" |
| 13 #include "mojo/environment/scoped_chromium_init.h" |
| 13 #include "mojo/public/c/system/main.h" | 14 #include "mojo/public/c/system/main.h" |
| 14 #include "mojo/public/cpp/application/application_impl_base.h" | 15 #include "mojo/public/cpp/application/application_impl_base.h" |
| 15 #include "mojo/public/cpp/application/run_application.h" | 16 #include "mojo/public/cpp/application/run_application.h" |
| 16 | 17 |
| 17 namespace mojo { | 18 namespace mojo { |
| 18 namespace media { | 19 namespace media { |
| 19 namespace examples { | 20 namespace examples { |
| 20 | 21 |
| 21 class MediaTestApp : public mojo::ApplicationImplBase { | 22 class MediaTestApp : public mojo::ApplicationImplBase { |
| 22 public: | 23 public: |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 | 307 |
| 307 const char* MediaTestApp::kHome = "\r"; | 308 const char* MediaTestApp::kHome = "\r"; |
| 308 const char* MediaTestApp::kClearLine = "\033[K"; | 309 const char* MediaTestApp::kClearLine = "\033[K"; |
| 309 const char* MediaTestApp::kUp = "\033[A"; | 310 const char* MediaTestApp::kUp = "\033[A"; |
| 310 | 311 |
| 311 } // namespace examples | 312 } // namespace examples |
| 312 } // namespace media | 313 } // namespace media |
| 313 } // namespace mojo | 314 } // namespace mojo |
| 314 | 315 |
| 315 MojoResult MojoMain(MojoHandle application_request) { | 316 MojoResult MojoMain(MojoHandle application_request) { |
| 317 mojo::ScopedChromiumInit init; |
| 316 mojo::media::examples::MediaTestApp media_test_app; | 318 mojo::media::examples::MediaTestApp media_test_app; |
| 317 return mojo::RunMainApplication(application_request, &media_test_app); | 319 return mojo::RunApplication(application_request, &media_test_app); |
| 318 } | 320 } |
| OLD | NEW |