| 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/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 737 #if defined(OS_WIN) | 737 #if defined(OS_WIN) |
| 738 SuppressWindowsErrorDialogs(); | 738 SuppressWindowsErrorDialogs(); |
| 739 #endif | 739 #endif |
| 740 } | 740 } |
| 741 | 741 |
| 742 int ChromeMainDelegate::RunProcess( | 742 int ChromeMainDelegate::RunProcess( |
| 743 const std::string& process_type, | 743 const std::string& process_type, |
| 744 const content::MainFunctionParams& main_function_params) { | 744 const content::MainFunctionParams& main_function_params) { |
| 745 // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize | 745 // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize |
| 746 // doesn't support empty array. So we comment out the block for Android. | 746 // doesn't support empty array. So we comment out the block for Android. |
| 747 #if !defined(OS_ANDROID) && !defined(CHROME_MULTIPLE_DLL_CHILD) | 747 #if !defined(OS_ANDROID) |
| 748 static const MainFunction kMainFunctions[] = { | 748 static const MainFunction kMainFunctions[] = { |
| 749 #if defined(ENABLE_FULL_PRINTING) | 749 #if defined(ENABLE_FULL_PRINTING) && !defined(CHROME_MULTIPLE_DLL_CHILD) |
| 750 { switches::kServiceProcess, ServiceProcessMain }, | 750 { switches::kServiceProcess, ServiceProcessMain }, |
| 751 #endif | 751 #endif |
| 752 | 752 |
| 753 #if defined(OS_MACOSX) | 753 #if defined(OS_MACOSX) |
| 754 { switches::kRelauncherProcess, | 754 { switches::kRelauncherProcess, |
| 755 mac_relauncher::internal::RelauncherMain }, | 755 mac_relauncher::internal::RelauncherMain }, |
| 756 #endif | 756 #endif |
| 757 | 757 |
| 758 #if !defined(DISABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) | 758 #if !defined(DISABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 759 { switches::kNaClLoaderProcess, NaClMain }, | 759 { switches::kNaClLoaderProcess, NaClMain }, |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 850 } | 850 } |
| 851 | 851 |
| 852 content::ContentUtilityClient* | 852 content::ContentUtilityClient* |
| 853 ChromeMainDelegate::CreateContentUtilityClient() { | 853 ChromeMainDelegate::CreateContentUtilityClient() { |
| 854 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 854 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 855 return NULL; | 855 return NULL; |
| 856 #else | 856 #else |
| 857 return &g_chrome_content_utility_client.Get(); | 857 return &g_chrome_content_utility_client.Get(); |
| 858 #endif | 858 #endif |
| 859 } | 859 } |
| OLD | NEW |