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

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

Issue 2647273002: Remove ScopedVector from content::ZygoteMain() (Closed)
Patch Set: Created 3 years, 11 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 | « chrome/app/chrome_main_delegate.h ('k') | components/nacl/zygote/nacl_fork_delegate_linux.h » ('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) 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 <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 #if !defined(DISABLE_NACL) 1003 #if !defined(DISABLE_NACL)
1004 // NaClLoader does this in NaClMainPlatformDelegate::EnableSandbox(). 1004 // NaClLoader does this in NaClMainPlatformDelegate::EnableSandbox().
1005 // No sandbox needed for relauncher. 1005 // No sandbox needed for relauncher.
1006 if (process_type == switches::kNaClLoaderProcess) 1006 if (process_type == switches::kNaClLoaderProcess)
1007 return true; 1007 return true;
1008 #endif 1008 #endif
1009 return process_type == switches::kRelauncherProcess; 1009 return process_type == switches::kRelauncherProcess;
1010 } 1010 }
1011 #elif defined(OS_POSIX) && !defined(OS_ANDROID) 1011 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
1012 void ChromeMainDelegate::ZygoteStarting( 1012 void ChromeMainDelegate::ZygoteStarting(
1013 ScopedVector<content::ZygoteForkDelegate>* delegates) { 1013 std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
1014 #if defined(OS_CHROMEOS) 1014 #if defined(OS_CHROMEOS)
1015 chromeos::ReloadElfTextInHugePages(); 1015 chromeos::ReloadElfTextInHugePages();
1016 #endif 1016 #endif
1017 1017
1018 #if !defined(DISABLE_NACL) 1018 #if !defined(DISABLE_NACL)
1019 nacl::AddNaClZygoteForkDelegates(delegates); 1019 nacl::AddNaClZygoteForkDelegates(delegates);
1020 #endif 1020 #endif
1021 } 1021 }
1022 1022
1023 void ChromeMainDelegate::ZygoteForked() { 1023 void ChromeMainDelegate::ZygoteForked() {
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 case version_info::Channel::CANARY: 1083 case version_info::Channel::CANARY:
1084 return true; 1084 return true;
1085 case version_info::Channel::DEV: 1085 case version_info::Channel::DEV:
1086 case version_info::Channel::BETA: 1086 case version_info::Channel::BETA:
1087 case version_info::Channel::STABLE: 1087 case version_info::Channel::STABLE:
1088 default: 1088 default:
1089 // Don't enable instrumentation. 1089 // Don't enable instrumentation.
1090 return false; 1090 return false;
1091 } 1091 }
1092 } 1092 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.h ('k') | components/nacl/zygote/nacl_fork_delegate_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698