content/shell/app/shell_content_main.cc - Issue 190853004: Convert ContentMain to take a struct instead of parameters that vary depending on the platform.

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: content/shell/app/shell_content_main.cc

Issue 190853004: Convert ContentMain to take a struct instead of parameters that vary depending on the platform. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: sync Created 6 years, 9 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 | Annotate | Revision Log

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "content/shell/app/shell_content_main.h"	5 #include "content/shell/app/shell_content_main.h"

6	6

7 #include "content/public/app/content_main.h"	7 #include "content/public/app/content_main.h"

8 #include "content/shell/app/shell_main_delegate.h"	8 #include "content/shell/app/shell_main_delegate.h"

9	9

10 #if defined(OS_MACOSX)	10 #if defined(OS_MACOSX)

11 int ContentMain(int argc,	11 int ContentMain(int argc,

12 const char** argv) {	12 const char** argv) {

13 content::ShellMainDelegate delegate;	13 content::ShellMainDelegate delegate;

14 return content::ContentMain(argc, argv, &delegate);	14 content::ContentMainParams params(&delegate);

	15 params.argc = argc;

	16 params.argv = argv;

	17 return content::ContentMain(params);

15 }	18 }

16 #endif // OS_MACOSX	19 #endif // OS_MACOSX

OLD	NEW

« no previous file with comments | « content/public/test/test_launcher.cc ('k') | content/shell/app/shell_main.cc » ('j') | no next file with comments »