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

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

Issue 1649933002: [Chromecast] Hook up mojo media pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed chrome build with enable_mojo_media 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
Index: media/mojo/services/mojo_media_application.cc
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
index 501cf939739e1909d21343dec9e606d141c8186c..687a6d02a8f2673393ce4c24155e5e0f597c50d2 100644
--- a/media/mojo/services/mojo_media_application.cc
+++ b/media/mojo/services/mojo_media_application.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/logging.h"
#include "media/base/media_log.h"
#include "media/mojo/services/mojo_media_client.h"
#include "media/mojo/services/service_factory_impl.h"
@@ -15,21 +14,10 @@
namespace media {
-// static
-scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() {
- // In all existing use cases we don't need to initialize logging when using
- // CreateApp() to create the application. We can pass |enable_logging| in
- // CreateApp() if this isn't the case any more in the future.
- return scoped_ptr<mojo::ApplicationDelegate>(
- new MojoMediaApplication(false, MojoMediaClient::Create()));
-}
-
// TODO(xhwang): Hook up MediaLog when possible.
MojoMediaApplication::MojoMediaApplication(
- bool enable_logging,
scoped_ptr<MojoMediaClient> mojo_media_client)
- : enable_logging_(enable_logging),
- mojo_media_client_(std::move(mojo_media_client)),
+ : mojo_media_client_(std::move(mojo_media_client)),
app_impl_(nullptr),
media_log_(new MediaLog()) {}
@@ -38,14 +26,6 @@ MojoMediaApplication::~MojoMediaApplication() {
void MojoMediaApplication::Initialize(mojo::ApplicationImpl* app) {
app_impl_ = app;
-
- if (enable_logging_) {
- logging::LoggingSettings settings;
- settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
- logging::InitLogging(settings);
- // Display process ID, thread ID and timestamp in logs.
- logging::SetLogItems(true, true, true, false);
- }
mojo_media_client_->Initialize();
}

Powered by Google App Engine
This is Rietveld 408576698