OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 5 #include "chrome/app/chrome_main.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/metrics/stats_counters.h" | 10 #include "base/metrics/stats_counters.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
26 #include "chrome/common/chrome_version_info.h" | 26 #include "chrome/common/chrome_version_info.h" |
27 #include "chrome/common/logging_chrome.h" | 27 #include "chrome/common/logging_chrome.h" |
28 #include "chrome/common/profiling.h" | 28 #include "chrome/common/profiling.h" |
29 #include "chrome/common/url_constants.h" | 29 #include "chrome/common/url_constants.h" |
30 #include "chrome/renderer/chrome_content_renderer_client.h" | 30 #include "chrome/renderer/chrome_content_renderer_client.h" |
31 #include "chrome/utility/chrome_content_utility_client.h" | 31 #include "chrome/utility/chrome_content_utility_client.h" |
32 #include "content/app/content_main.h" | 32 #include "content/app/content_main.h" |
33 #include "content/app/content_main_delegate.h" | 33 #include "content/app/content_main_delegate.h" |
34 #include "content/browser/renderer_host/render_process_host.h" | 34 #include "content/browser/renderer_host/render_process_host.h" |
| 35 #include "content/renderer/renderer_main.h" |
35 #include "content/common/content_client.h" | 36 #include "content/common/content_client.h" |
36 #include "content/common/content_counters.h" | 37 #include "content/common/content_counters.h" |
37 #include "content/common/content_paths.h" | 38 #include "content/common/content_paths.h" |
38 #include "ipc/ipc_switches.h" | 39 #include "ipc/ipc_switches.h" |
39 #include "media/base/media.h" | 40 #include "media/base/media.h" |
40 #include "ui/base/resource/resource_bundle.h" | 41 #include "ui/base/resource/resource_bundle.h" |
41 #include "ui/base/ui_base_switches.h" | 42 #include "ui/base/ui_base_switches.h" |
42 | 43 |
43 #if defined(OS_WIN) | 44 #if defined(OS_WIN) |
44 #include <algorithm> | 45 #include <algorithm> |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 base::LazyInstance<chrome::ChromeContentRendererClient> | 94 base::LazyInstance<chrome::ChromeContentRendererClient> |
94 g_chrome_content_renderer_client(base::LINKER_INITIALIZED); | 95 g_chrome_content_renderer_client(base::LINKER_INITIALIZED); |
95 base::LazyInstance<chrome::ChromeContentUtilityClient> | 96 base::LazyInstance<chrome::ChromeContentUtilityClient> |
96 g_chrome_content_utility_client(base::LINKER_INITIALIZED); | 97 g_chrome_content_utility_client(base::LINKER_INITIALIZED); |
97 #endif // NACL_WIN64 | 98 #endif // NACL_WIN64 |
98 | 99 |
99 base::LazyInstance<chrome::ChromeContentPluginClient> | 100 base::LazyInstance<chrome::ChromeContentPluginClient> |
100 g_chrome_content_plugin_client(base::LINKER_INITIALIZED); | 101 g_chrome_content_plugin_client(base::LINKER_INITIALIZED); |
101 | 102 |
102 extern int BrowserMain(const MainFunctionParams&); | 103 extern int BrowserMain(const MainFunctionParams&); |
103 extern int RendererMain(const MainFunctionParams&); | |
104 extern int NaClMain(const MainFunctionParams&); | 104 extern int NaClMain(const MainFunctionParams&); |
105 extern int ProfileImportMain(const MainFunctionParams&); | 105 extern int ProfileImportMain(const MainFunctionParams&); |
106 #if defined(_WIN64) | 106 #if defined(_WIN64) |
107 extern int NaClBrokerMain(const MainFunctionParams&); | 107 extern int NaClBrokerMain(const MainFunctionParams&); |
108 #endif | 108 #endif |
109 extern int ServiceProcessMain(const MainFunctionParams&); | 109 extern int ServiceProcessMain(const MainFunctionParams&); |
110 | 110 |
111 #if defined(OS_WIN) | 111 #if defined(OS_WIN) |
112 // TODO(erikkay): isn't this already defined somewhere? | 112 // TODO(erikkay): isn't this already defined somewhere? |
113 #define DLLEXPORT __declspec(dllexport) | 113 #define DLLEXPORT __declspec(dllexport) |
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
749 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, | 749 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, |
750 sandbox::SandboxInterfaceInfo* sandbox_info) { | 750 sandbox::SandboxInterfaceInfo* sandbox_info) { |
751 ChromeMainDelegate chrome_main_delegate; | 751 ChromeMainDelegate chrome_main_delegate; |
752 return content::ContentMain(instance, sandbox_info, &chrome_main_delegate); | 752 return content::ContentMain(instance, sandbox_info, &chrome_main_delegate); |
753 #elif defined(OS_POSIX) | 753 #elif defined(OS_POSIX) |
754 int ChromeMain(int argc, char** argv) { | 754 int ChromeMain(int argc, char** argv) { |
755 ChromeMainDelegate chrome_main_delegate; | 755 ChromeMainDelegate chrome_main_delegate; |
756 return content::ContentMain(argc, argv, &chrome_main_delegate); | 756 return content::ContentMain(argc, argv, &chrome_main_delegate); |
757 #endif | 757 #endif |
758 } | 758 } |
OLD | NEW |