Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1245)

Unified Diff: media/mojo/services/main.cc

Issue 1649933002: [Chromecast] Hook up mojo media pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed gn check Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | media/mojo/services/mojo_media_application.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/main.cc
diff --git a/media/mojo/services/main.cc b/media/mojo/services/main.cc
index 1fb7a6321cbf3db87939ec22163fb0d9513bb36b..046fa0c40b27d194d2dcb73b491fd8206c736118 100644
--- a/media/mojo/services/main.cc
+++ b/media/mojo/services/main.cc
@@ -2,14 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/at_exit.h"
#include "media/mojo/services/mojo_media_application.h"
-#include "media/mojo/services/mojo_media_client.h"
+#include "mojo/logging/init_logging.h"
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
MojoResult MojoMain(MojoHandle mojo_handle) {
- // Create MojoMediaApplication and enable logging.
- mojo::ApplicationRunner runner(
- new media::MojoMediaApplication(true, media::MojoMediaClient::Create()));
- return runner.Run(mojo_handle);
+ // Enable logging.
+ base::AtExitManager at_exit;
+ mojo::ApplicationRunner::InitBaseCommandLine();
+ mojo::InitLogging();
+
+ scoped_ptr<mojo::ApplicationDelegate> app_delegate =
+ media::MojoMediaApplication::CreateApp();
+ mojo::ApplicationRunner runner(app_delegate.release());
+ return runner.Run(mojo_handle, false /* init_base */);
}
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | media/mojo/services/mojo_media_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698