media/mojo/services/main.cc - Issue 1877753003: Move mojo\shell to services\shell

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan

Patch Set: . Created 4 years, 8 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/android_mojo_media_client.cc ('k') | media/mojo/services/media_apptest.cc » ('j') | no next file with comments »

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 "base/at_exit.h"	5 #include "base/at_exit.h"

6 #include "base/memory/ptr_util.h"	6 #include "base/memory/ptr_util.h"

7 #include "media/mojo/services/mojo_media_application.h"	7 #include "media/mojo/services/mojo_media_application.h"

8 #include "media/mojo/services/test_mojo_media_client.h"	8 #include "media/mojo/services/test_mojo_media_client.h"

9 #include "mojo/logging/init_logging.h"	9 #include "mojo/logging/init_logging.h"

10 #include "mojo/public/c/system/main.h"	10 #include "mojo/public/c/system/main.h"

11 #include "mojo/shell/public/cpp/application_runner.h"	11 #include "services/shell/public/cpp/application_runner.h"

12	12

13 MojoResult MojoMain(MojoHandle mojo_handle) {	13 MojoResult MojoMain(MojoHandle mojo_handle) {

14 // Enable logging.	14 // Enable logging.

15 base::AtExitManager at_exit;	15 base::AtExitManager at_exit;

16 mojo::ApplicationRunner::InitBaseCommandLine();	16 mojo::ApplicationRunner::InitBaseCommandLine();

17 mojo::InitLogging();	17 mojo::InitLogging();

18	18

19 mojo::ApplicationRunner runner(new media::MojoMediaApplication(	19 mojo::ApplicationRunner runner(new media::MojoMediaApplication(

20 base::WrapUnique(new media::TestMojoMediaClient())));	20 base::WrapUnique(new media::TestMojoMediaClient())));

21 return runner.Run(mojo_handle, false /* init_base */);	21 return runner.Run(mojo_handle, false /* init_base */);

22 }	22 }

OLD	NEW