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

Side by Side Diff: media/mojo/services/main.cc

Issue 2008383002: Remove a bunch of stuff in //mojo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | mojo/build/package_app.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/logging.h"
7 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
8 #include "media/mojo/services/mojo_media_application.h" 9 #include "media/mojo/services/mojo_media_application.h"
9 #include "media/mojo/services/test_mojo_media_client.h" 10 #include "media/mojo/services/test_mojo_media_client.h"
10 #include "mojo/logging/init_logging.h"
11 #include "mojo/public/c/system/main.h" 11 #include "mojo/public/c/system/main.h"
12 #include "services/shell/public/cpp/application_runner.h" 12 #include "services/shell/public/cpp/application_runner.h"
13 13
14 namespace { 14 namespace {
15 15
16 shell::ApplicationRunner* g_runner = nullptr; 16 shell::ApplicationRunner* g_runner = nullptr;
17 17
18 void QuitApplication() { 18 void QuitApplication() {
19 DCHECK(g_runner); 19 DCHECK(g_runner);
20 g_runner->Quit(); 20 g_runner->Quit();
21 } 21 }
22 22
23 } // namespace 23 } // namespace
24 24
25 MojoResult MojoMain(MojoHandle mojo_handle) { 25 MojoResult MojoMain(MojoHandle mojo_handle) {
26 // Enable logging. 26 // Enable logging.
27 base::AtExitManager at_exit; 27 base::AtExitManager at_exit;
28 shell::ApplicationRunner::InitBaseCommandLine(); 28 shell::ApplicationRunner::InitBaseCommandLine();
29 mojo::InitLogging(); 29
30 logging::LoggingSettings settings;
31 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
32 logging::InitLogging(settings);
30 33
31 shell::ApplicationRunner runner(new media::MojoMediaApplication( 34 shell::ApplicationRunner runner(new media::MojoMediaApplication(
32 base::WrapUnique(new media::TestMojoMediaClient()), 35 base::WrapUnique(new media::TestMojoMediaClient()),
33 base::Bind(&QuitApplication))); 36 base::Bind(&QuitApplication)));
34 g_runner = &runner; 37 g_runner = &runner;
35 return runner.Run(mojo_handle, false /* init_base */); 38 return runner.Run(mojo_handle, false /* init_base */);
36 } 39 }
OLDNEW
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | mojo/build/package_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698