OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/shell/app/shell_main_delegate.h" | 5 #include "extensions/shell/app/shell_main_delegate.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 return renderer_client_.get(); | 117 return renderer_client_.get(); |
118 } | 118 } |
119 | 119 |
120 content::ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 120 content::ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
121 utility_client_.reset(CreateShellContentUtilityClient()); | 121 utility_client_.reset(CreateShellContentUtilityClient()); |
122 return utility_client_.get(); | 122 return utility_client_.get(); |
123 } | 123 } |
124 | 124 |
125 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) | 125 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
126 void ShellMainDelegate::ZygoteStarting( | 126 void ShellMainDelegate::ZygoteStarting( |
127 ScopedVector<content::ZygoteForkDelegate>* delegates) { | 127 std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { |
128 #if !defined(DISABLE_NACL) | 128 #if !defined(DISABLE_NACL) |
129 nacl::AddNaClZygoteForkDelegates(delegates); | 129 nacl::AddNaClZygoteForkDelegates(delegates); |
130 #endif // DISABLE_NACL | 130 #endif // DISABLE_NACL |
131 } | 131 } |
132 #endif // OS_POSIX && !OS_MACOSX && !OS_ANDROID | 132 #endif // OS_POSIX && !OS_MACOSX && !OS_ANDROID |
133 | 133 |
134 content::ContentClient* ShellMainDelegate::CreateContentClient() { | 134 content::ContentClient* ShellMainDelegate::CreateContentClient() { |
135 return new ShellContentClient(); | 135 return new ShellContentClient(); |
136 } | 136 } |
137 | 137 |
(...skipping 28 matching lines...) Expand all Loading... |
166 #if !defined(DISABLE_NACL) | 166 #if !defined(DISABLE_NACL) |
167 process_type == switches::kNaClLoaderProcess || | 167 process_type == switches::kNaClLoaderProcess || |
168 #endif | 168 #endif |
169 #if defined(OS_MACOSX) | 169 #if defined(OS_MACOSX) |
170 process_type == switches::kGpuProcess || | 170 process_type == switches::kGpuProcess || |
171 #endif | 171 #endif |
172 process_type == switches::kUtilityProcess; | 172 process_type == switches::kUtilityProcess; |
173 } | 173 } |
174 | 174 |
175 } // namespace extensions | 175 } // namespace extensions |
OLD | NEW |