| 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/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 #endif | 803 #endif |
| 804 } | 804 } |
| 805 | 805 |
| 806 int ChromeMainDelegate::RunProcess( | 806 int ChromeMainDelegate::RunProcess( |
| 807 const std::string& process_type, | 807 const std::string& process_type, |
| 808 const content::MainFunctionParams& main_function_params) { | 808 const content::MainFunctionParams& main_function_params) { |
| 809 // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize | 809 // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize |
| 810 // doesn't support empty array. So we comment out the block for Android. | 810 // doesn't support empty array. So we comment out the block for Android. |
| 811 #if !defined(OS_ANDROID) | 811 #if !defined(OS_ANDROID) |
| 812 static const MainFunction kMainFunctions[] = { | 812 static const MainFunction kMainFunctions[] = { |
| 813 #if defined(ENABLE_FULL_PRINTING) && !defined(CHROME_MULTIPLE_DLL_CHILD) | 813 #if defined(ENABLE_PRINT_PREVIEW) && !defined(CHROME_MULTIPLE_DLL_CHILD) |
| 814 { switches::kServiceProcess, ServiceProcessMain }, | 814 { switches::kServiceProcess, ServiceProcessMain }, |
| 815 #endif | 815 #endif |
| 816 | 816 |
| 817 #if defined(OS_MACOSX) | 817 #if defined(OS_MACOSX) |
| 818 { switches::kRelauncherProcess, | 818 { switches::kRelauncherProcess, |
| 819 mac_relauncher::internal::RelauncherMain }, | 819 mac_relauncher::internal::RelauncherMain }, |
| 820 #endif | 820 #endif |
| 821 | 821 |
| 822 // This entry is not needed on Linux, where the NaCl loader | 822 // This entry is not needed on Linux, where the NaCl loader |
| 823 // process is launched via nacl_helper instead. | 823 // process is launched via nacl_helper instead. |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 } | 940 } |
| 941 | 941 |
| 942 content::ContentUtilityClient* | 942 content::ContentUtilityClient* |
| 943 ChromeMainDelegate::CreateContentUtilityClient() { | 943 ChromeMainDelegate::CreateContentUtilityClient() { |
| 944 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 944 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 945 return NULL; | 945 return NULL; |
| 946 #else | 946 #else |
| 947 return g_chrome_content_utility_client.Pointer(); | 947 return g_chrome_content_utility_client.Pointer(); |
| 948 #endif | 948 #endif |
| 949 } | 949 } |
| OLD | NEW |