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

Side by Side Diff: chrome/app/chrome_dll_main.cc

Issue 257029: Add an option to disable NaCl at compile time for platforms where it doesn't build yet (Closed)
Patch Set: Created 11 years, 2 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 | « build/common.gypi ('k') | chrome/browser/nacl_process_host.cc » ('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 (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 // TODO(port): the ifdefs in here are a first step towards trying to determine 5 // TODO(port): the ifdefs in here are a first step towards trying to determine
6 // the correct abstraction for all the OS functionality required at this 6 // the correct abstraction for all the OS functionality required at this
7 // stage of process initialization. It should not be taken as a final 7 // stage of process initialization. It should not be taken as a final
8 // abstraction. 8 // abstraction.
9 9
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 } else if (process_type == switches::kProfileImportProcess) { 557 } else if (process_type == switches::kProfileImportProcess) {
558 #if defined (OS_MACOSX) 558 #if defined (OS_MACOSX)
559 rv = ProfileImportMain(main_params); 559 rv = ProfileImportMain(main_params);
560 #else 560 #else
561 // TODO(port): Use OOP profile import - http://crbug.com/22142 . 561 // TODO(port): Use OOP profile import - http://crbug.com/22142 .
562 NOTIMPLEMENTED(); 562 NOTIMPLEMENTED();
563 rv = -1; 563 rv = -1;
564 #endif 564 #endif
565 } else if (process_type == switches::kWorkerProcess) { 565 } else if (process_type == switches::kWorkerProcess) {
566 rv = WorkerMain(main_params); 566 rv = WorkerMain(main_params);
567 #ifndef DISABLE_NACL
567 } else if (process_type == switches::kNaClProcess) { 568 } else if (process_type == switches::kNaClProcess) {
568 rv = NaClMain(main_params); 569 rv = NaClMain(main_params);
570 #endif
569 } else if (process_type == switches::kZygoteProcess) { 571 } else if (process_type == switches::kZygoteProcess) {
570 #if defined(OS_LINUX) 572 #if defined(OS_LINUX)
571 if (ZygoteMain(main_params)) { 573 if (ZygoteMain(main_params)) {
572 // Zygote::HandleForkRequest may have reallocated the command 574 // Zygote::HandleForkRequest may have reallocated the command
573 // line so update it here with the new version. 575 // line so update it here with the new version.
574 const CommandLine& parsed_command_line = 576 const CommandLine& parsed_command_line =
575 *CommandLine::ForCurrentProcess(); 577 *CommandLine::ForCurrentProcess();
576 MainFunctionParams main_params(parsed_command_line, sandbox_wrapper, 578 MainFunctionParams main_params(parsed_command_line, sandbox_wrapper,
577 &autorelease_pool); 579 &autorelease_pool);
578 rv = RendererMain(main_params); 580 rv = RendererMain(main_params);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 621
620 logging::CleanupChromeLogging(); 622 logging::CleanupChromeLogging();
621 623
622 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD) 624 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
623 // TODO(mark): See the TODO(mark) above at InitCrashReporter. 625 // TODO(mark): See the TODO(mark) above at InitCrashReporter.
624 DestructCrashReporter(); 626 DestructCrashReporter();
625 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD 627 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD
626 628
627 return rv; 629 return rv;
628 } 630 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698