OLD | NEW |
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/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 score = kPluginScore; | 192 score = kPluginScore; |
193 } else if (process_type == switches::kPpapiBrokerProcess) { | 193 } else if (process_type == switches::kPpapiBrokerProcess) { |
194 // The broker should be killed before the PPAPI plugin. | 194 // The broker should be killed before the PPAPI plugin. |
195 score = kPluginScore + kScoreBump; | 195 score = kPluginScore + kScoreBump; |
196 } else if (process_type == switches::kUtilityProcess || | 196 } else if (process_type == switches::kUtilityProcess || |
197 process_type == switches::kWorkerProcess || | 197 process_type == switches::kWorkerProcess || |
198 process_type == switches::kGpuProcess || | 198 process_type == switches::kGpuProcess || |
199 process_type == switches::kServiceProcess) { | 199 process_type == switches::kServiceProcess) { |
200 score = kMiscScore; | 200 score = kMiscScore; |
201 #ifndef DISABLE_NACL | 201 #ifndef DISABLE_NACL |
202 } else if (process_type == switches::kNaClLoaderProcess) { | 202 } else if (process_type == switches::kNaClLoaderProcess || |
| 203 process_type == switches::kNaClLoaderNonSfiProcess) { |
203 score = kPluginScore; | 204 score = kPluginScore; |
204 #endif | 205 #endif |
205 } else if (process_type == switches::kZygoteProcess || | 206 } else if (process_type == switches::kZygoteProcess || |
206 process_type.empty()) { | 207 process_type.empty()) { |
207 // For zygotes and unlabeled process types, we want to still make | 208 // For zygotes and unlabeled process types, we want to still make |
208 // them killable by the OOM killer. | 209 // them killable by the OOM killer. |
209 score = kZygoteScore; | 210 score = kZygoteScore; |
210 } else if (process_type == switches::kRendererProcess) { | 211 } else if (process_type == switches::kRendererProcess) { |
211 LOG(WARNING) << "process type 'renderer' " | 212 LOG(WARNING) << "process type 'renderer' " |
212 << "should be created through the zygote."; | 213 << "should be created through the zygote."; |
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 } | 902 } |
902 | 903 |
903 content::ContentUtilityClient* | 904 content::ContentUtilityClient* |
904 ChromeMainDelegate::CreateContentUtilityClient() { | 905 ChromeMainDelegate::CreateContentUtilityClient() { |
905 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 906 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
906 return NULL; | 907 return NULL; |
907 #else | 908 #else |
908 return g_chrome_content_utility_client.Pointer(); | 909 return g_chrome_content_utility_client.Pointer(); |
909 #endif | 910 #endif |
910 } | 911 } |
OLD | NEW |