Chromium Code Reviews| 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 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 732 #if defined(OS_WIN) | 732 #if defined(OS_WIN) |
| 733 SuppressWindowsErrorDialogs(); | 733 SuppressWindowsErrorDialogs(); |
| 734 #endif | 734 #endif |
| 735 } | 735 } |
| 736 | 736 |
| 737 int ChromeMainDelegate::RunProcess( | 737 int ChromeMainDelegate::RunProcess( |
| 738 const std::string& process_type, | 738 const std::string& process_type, |
| 739 const content::MainFunctionParams& main_function_params) { | 739 const content::MainFunctionParams& main_function_params) { |
| 740 // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize | 740 // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize |
| 741 // doesn't support empty array. So we comment out the block for Android. | 741 // doesn't support empty array. So we comment out the block for Android. |
| 742 #if !defined(OS_ANDROID) && \ | 742 #if !defined(ANDROID) && \ |
|
cimamoglu1
2013/08/11 18:22:51
Why ANDROID but not OS_ANDROID?
Lei Zhang
2013/08/12 06:06:15
Typo, fixed.
| |
| 743 (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_BROWSER)) | 743 (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_BROWSER)) |
| 744 static const MainFunction kMainFunctions[] = { | 744 static const MainFunction kMainFunctions[] = { |
| 745 #if defined(ENABLE_FULL_PRINTING) | |
| 745 { switches::kServiceProcess, ServiceProcessMain }, | 746 { switches::kServiceProcess, ServiceProcessMain }, |
| 747 #endif | |
| 748 | |
| 746 #if defined(OS_MACOSX) | 749 #if defined(OS_MACOSX) |
| 747 { switches::kRelauncherProcess, | 750 { switches::kRelauncherProcess, |
| 748 mac_relauncher::internal::RelauncherMain }, | 751 mac_relauncher::internal::RelauncherMain }, |
| 749 #endif | 752 #endif |
| 750 | 753 |
| 751 #if !defined(DISABLE_NACL) && \ | 754 #if !defined(DISABLE_NACL) && \ |
| 752 (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)) | 755 (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)) |
| 753 { switches::kNaClLoaderProcess, NaClMain }, | 756 { switches::kNaClLoaderProcess, NaClMain }, |
| 754 #endif // DISABLE_NACL | 757 #endif // DISABLE_NACL |
| 755 }; | 758 }; |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 844 } | 847 } |
| 845 | 848 |
| 846 content::ContentUtilityClient* | 849 content::ContentUtilityClient* |
| 847 ChromeMainDelegate::CreateContentUtilityClient() { | 850 ChromeMainDelegate::CreateContentUtilityClient() { |
| 848 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 851 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 849 return NULL; | 852 return NULL; |
| 850 #else | 853 #else |
| 851 return &g_chrome_content_utility_client.Get(); | 854 return &g_chrome_content_utility_client.Get(); |
| 852 #endif | 855 #endif |
| 853 } | 856 } |
| OLD | NEW |