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

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

Issue 2156203003: shell::ApplicationRunner -> shell::ServiceRunner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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 | « mash/webtest/webtest.cc ('k') | mojo/public/cpp/bindings/tests/versioning_test_service.cc » ('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 da49ea3981bc00888bcf0ef47cea17204ce481f0..633f0dedb80a947f47427e714e2dcf5c2106d809 100644
--- a/media/mojo/services/main.cc
+++ b/media/mojo/services/main.cc
@@ -9,11 +9,11 @@
#include "media/mojo/services/mojo_media_application.h"
#include "media/mojo/services/test_mojo_media_client.h"
#include "mojo/public/c/system/main.h"
-#include "services/shell/public/cpp/application_runner.h"
+#include "services/shell/public/cpp/service_runner.h"
namespace {
-shell::ApplicationRunner* g_runner = nullptr;
+shell::ServiceRunner* g_runner = nullptr;
void QuitApplication() {
DCHECK(g_runner);
@@ -25,13 +25,13 @@ void QuitApplication() {
MojoResult MojoMain(MojoHandle mojo_handle) {
// Enable logging.
base::AtExitManager at_exit;
- shell::ApplicationRunner::InitBaseCommandLine();
+ shell::ServiceRunner::InitBaseCommandLine();
logging::LoggingSettings settings;
settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
logging::InitLogging(settings);
- shell::ApplicationRunner runner(new media::MojoMediaApplication(
+ shell::ServiceRunner runner(new media::MojoMediaApplication(
base::WrapUnique(new media::TestMojoMediaClient()),
base::Bind(&QuitApplication)));
g_runner = &runner;
« no previous file with comments | « mash/webtest/webtest.cc ('k') | mojo/public/cpp/bindings/tests/versioning_test_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698