diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-26 02:22:17 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-26 02:22:17 +0000 |
| commit | 37e1bb64e696f39acb8a80021af58356af8e3bf1 (patch) | |
| tree | 32b249c3356c2620b5d22858e3c19c14a430955e /chrome/app/chrome_dll_main.cc | |
| parent | 8e8503072f1bf91c59b15b54274ec907505b0376 (diff) | |
| download | chromium_src-37e1bb64e696f39acb8a80021af58356af8e3bf1.zip chromium_src-37e1bb64e696f39acb8a80021af58356af8e3bf1.tar.gz chromium_src-37e1bb64e696f39acb8a80021af58356af8e3bf1.tar.bz2 | |
Revert 27315 - First step towards NaClChrome integration:1. NaCl plugin becomes a builtin plugin in Chrome and runs in the renderer process.2. Most of the changes are related to launching the NaCl process (that loads and runs the NaCl module) and establishing the initial communication between that process and the NaCl plugin.3. Command line flag "internalnacl" is required to enable the builtin NaCl plugin. NaCl still cannot run in Chrome sandbox, the flag automatically disables the sandbox
Review URL: http://codereview.chromium.org/153002
TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/244014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index b5b0b7b..9f135b5 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -83,7 +83,6 @@ extern int BrowserMain(const MainFunctionParams&); extern int RendererMain(const MainFunctionParams&); extern int PluginMain(const MainFunctionParams&); extern int WorkerMain(const MainFunctionParams&); -extern int NaClMain(const MainFunctionParams&); extern int UtilityMain(const MainFunctionParams&); extern int ProfileImportMain(const MainFunctionParams&); extern int ZygoteMain(const MainFunctionParams&); @@ -582,8 +581,6 @@ int ChromeMain(int argc, char** argv) { #endif } else if (process_type == switches::kWorkerProcess) { rv = WorkerMain(main_params); - } else if (process_type == switches::kNaClProcess) { - rv = NaClMain(main_params); } else if (process_type == switches::kZygoteProcess) { #if defined(OS_LINUX) if (ZygoteMain(main_params)) { |