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

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

Issue 279693002: Split NaCl SFI and non-SFI helpers into separate processes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/cpu.h" 8 #include "base/cpu.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 const std::string& process_type) { 851 const std::string& process_type) {
852 // NaClLoader does this in NaClMainPlatformDelegate::EnableSandbox(). 852 // NaClLoader does this in NaClMainPlatformDelegate::EnableSandbox().
853 // No sandbox needed for relauncher. 853 // No sandbox needed for relauncher.
854 return process_type == switches::kNaClLoaderProcess || 854 return process_type == switches::kNaClLoaderProcess ||
855 process_type == switches::kRelauncherProcess; 855 process_type == switches::kRelauncherProcess;
856 } 856 }
857 #elif defined(OS_POSIX) && !defined(OS_ANDROID) 857 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
858 void ChromeMainDelegate::ZygoteStarting( 858 void ChromeMainDelegate::ZygoteStarting(
859 ScopedVector<content::ZygoteForkDelegate>* delegates) { 859 ScopedVector<content::ZygoteForkDelegate>* delegates) {
860 #if !defined(DISABLE_NACL) 860 #if !defined(DISABLE_NACL)
861 delegates->push_back(new NaClForkDelegate()); 861 delegates->push_back(new NaClForkDelegate(false));
jln (very slow on Chromium) 2014/05/09 20:51:20 Add /* non_sfi */ comments next to false and true?
mdempsky 2014/05/09 21:34:11 Done.
862 delegates->push_back(new NaClForkDelegate(true));
862 #endif 863 #endif
863 } 864 }
864 865
865 void ChromeMainDelegate::ZygoteForked() { 866 void ChromeMainDelegate::ZygoteForked() {
866 Profiling::ProcessStarted(); 867 Profiling::ProcessStarted();
867 if (Profiling::BeingProfiled()) { 868 if (Profiling::BeingProfiled()) {
868 base::debug::RestartProfilingAfterFork(); 869 base::debug::RestartProfilingAfterFork();
869 SetUpProfilingShutdownHandler(); 870 SetUpProfilingShutdownHandler();
870 } 871 }
871 872
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 } 910 }
910 911
911 content::ContentUtilityClient* 912 content::ContentUtilityClient*
912 ChromeMainDelegate::CreateContentUtilityClient() { 913 ChromeMainDelegate::CreateContentUtilityClient() {
913 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 914 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
914 return NULL; 915 return NULL;
915 #else 916 #else
916 return g_chrome_content_utility_client.Pointer(); 917 return g_chrome_content_utility_client.Pointer();
917 #endif 918 #endif
918 } 919 }
OLDNEW
« no previous file with comments | « no previous file | components/nacl/zygote/nacl_fork_delegate_linux.h » ('j') | components/nacl/zygote/nacl_fork_delegate_linux.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698