| 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/environment.h" | 8 #include "base/environment.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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 #endif | 240 #endif |
| 241 #if defined(OS_MACOSX) | 241 #if defined(OS_MACOSX) |
| 242 // Mac needs them too for scrollbar related images and for sandbox | 242 // Mac needs them too for scrollbar related images and for sandbox |
| 243 // profiles. | 243 // profiles. |
| 244 process_type == switches::kWorkerProcess || | 244 process_type == switches::kWorkerProcess || |
| 245 process_type == switches::kNaClLoaderProcess || | 245 process_type == switches::kNaClLoaderProcess || |
| 246 process_type == switches::kPpapiPluginProcess || | 246 process_type == switches::kPpapiPluginProcess || |
| 247 process_type == switches::kPpapiBrokerProcess || | 247 process_type == switches::kPpapiBrokerProcess || |
| 248 process_type == switches::kGpuProcess || | 248 process_type == switches::kGpuProcess || |
| 249 #endif | 249 #endif |
| 250 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 251 false; |
| 252 #else |
| 250 process_type == switches::kRendererProcess || | 253 process_type == switches::kRendererProcess || |
| 251 process_type == switches::kUtilityProcess; | 254 process_type == switches::kUtilityProcess; |
| 255 #endif |
| 252 } | 256 } |
| 253 | 257 |
| 254 #if defined(OS_MACOSX) | 258 #if defined(OS_MACOSX) |
| 255 // Update the name shown in Activity Monitor so users are less likely to ask | 259 // Update the name shown in Activity Monitor so users are less likely to ask |
| 256 // why Chrome has so many processes. | 260 // why Chrome has so many processes. |
| 257 void SetMacProcessName(const CommandLine& command_line) { | 261 void SetMacProcessName(const CommandLine& command_line) { |
| 258 std::string process_type = | 262 std::string process_type = |
| 259 command_line.GetSwitchValueASCII(switches::kProcessType); | 263 command_line.GetSwitchValueASCII(switches::kProcessType); |
| 260 // Don't worry about the browser process, its gets the stock name. | 264 // Don't worry about the browser process, its gets the stock name. |
| 261 int name_id = 0; | 265 int name_id = 0; |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 881 } | 885 } |
| 882 | 886 |
| 883 content::ContentUtilityClient* | 887 content::ContentUtilityClient* |
| 884 ChromeMainDelegate::CreateContentUtilityClient() { | 888 ChromeMainDelegate::CreateContentUtilityClient() { |
| 885 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 889 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 886 return NULL; | 890 return NULL; |
| 887 #else | 891 #else |
| 888 return &g_chrome_content_utility_client.Get(); | 892 return &g_chrome_content_utility_client.Get(); |
| 889 #endif | 893 #endif |
| 890 } | 894 } |
| OLD | NEW |