chrome/app/chrome_dll_main.cc - Issue 3915002: Out of process Pepper

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

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 3915002: Out of process Pepper (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 10 years, 1 month ago

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

Jump to:

Index: chrome/app/chrome_dll_main.cc

===================================================================

--- chrome/app/chrome_dll_main.cc (revision 65099)

+++ chrome/app/chrome_dll_main.cc (working copy)

@@ -110,6 +110,7 @@

extern int RendererMain(const MainFunctionParams&);

extern int GpuMain(const MainFunctionParams&);

extern int PluginMain(const MainFunctionParams&);

+extern int PpapiPluginMain(const MainFunctionParams&);

extern int WorkerMain(const MainFunctionParams&);

extern int NaClMain(const MainFunctionParams&);

extern int UtilityMain(const MainFunctionParams&);

@@ -277,7 +278,8 @@

const int kPluginScore = 10;

int score = -1;

- if (process_type == switches::kPluginProcess) {

+ if (process_type == switches::kPluginProcess ||

+ process_type == switches::kPpapiPluginProcess) {

score = kPluginScore;

} else if (process_type == switches::kUtilityProcess ||

process_type == switches::kWorkerProcess ||

@@ -843,6 +845,8 @@

rv = RendererMain(main_params);

} else if (process_type == switches::kPluginProcess) {

rv = PluginMain(main_params);

+ } else if (process_type == switches::kPpapiPluginProcess) {

+ rv = PpapiPluginMain(main_params);

} else if (process_type == switches::kUtilityProcess) {

rv = UtilityMain(main_params);

} else if (process_type == switches::kGpuProcess) {

« no previous file with comments | « base/scoped_native_library.cc ('k') | chrome/app/dummy_main_functions.cc » ('j') | no next file with comments »