Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(402)

Side by Side Diff: chrome/app/chrome_main.cc

Issue 7841009: export RendererMain (Closed)
Patch Set: fix stupid preprocessor typo Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/app/content_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/lazy_instance.h" 6 #include "base/lazy_instance.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/metrics/stats_counters.h" 8 #include "base/metrics/stats_counters.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
23 #include "chrome/common/chrome_version_info.h" 23 #include "chrome/common/chrome_version_info.h"
24 #include "chrome/common/logging_chrome.h" 24 #include "chrome/common/logging_chrome.h"
25 #include "chrome/common/profiling.h" 25 #include "chrome/common/profiling.h"
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "chrome/renderer/chrome_content_renderer_client.h" 27 #include "chrome/renderer/chrome_content_renderer_client.h"
28 #include "chrome/utility/chrome_content_utility_client.h" 28 #include "chrome/utility/chrome_content_utility_client.h"
29 #include "content/app/content_main.h" 29 #include "content/app/content_main.h"
30 #include "content/app/content_main_delegate.h" 30 #include "content/app/content_main_delegate.h"
31 #include "content/browser/renderer_host/render_process_host.h" 31 #include "content/browser/renderer_host/render_process_host.h"
32 #include "content/renderer/renderer_main.h"
32 #include "content/common/content_client.h" 33 #include "content/common/content_client.h"
33 #include "content/common/content_counters.h" 34 #include "content/common/content_counters.h"
34 #include "content/common/content_paths.h" 35 #include "content/common/content_paths.h"
35 #include "media/base/media.h" 36 #include "media/base/media.h"
36 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
37 #include "ui/base/ui_base_switches.h" 38 #include "ui/base/ui_base_switches.h"
38 39
39 #if defined(OS_WIN) 40 #if defined(OS_WIN)
40 #include <algorithm> 41 #include <algorithm>
41 #include <atlbase.h> 42 #include <atlbase.h>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 g_chrome_content_browser_client(base::LINKER_INITIALIZED); 95 g_chrome_content_browser_client(base::LINKER_INITIALIZED);
95 base::LazyInstance<chrome::ChromeContentRendererClient> 96 base::LazyInstance<chrome::ChromeContentRendererClient>
96 g_chrome_content_renderer_client(base::LINKER_INITIALIZED); 97 g_chrome_content_renderer_client(base::LINKER_INITIALIZED);
97 base::LazyInstance<chrome::ChromeContentUtilityClient> 98 base::LazyInstance<chrome::ChromeContentUtilityClient>
98 g_chrome_content_utility_client(base::LINKER_INITIALIZED); 99 g_chrome_content_utility_client(base::LINKER_INITIALIZED);
99 #endif // NACL_WIN64 100 #endif // NACL_WIN64
100 101
101 base::LazyInstance<chrome::ChromeContentPluginClient> 102 base::LazyInstance<chrome::ChromeContentPluginClient>
102 g_chrome_content_plugin_client(base::LINKER_INITIALIZED); 103 g_chrome_content_plugin_client(base::LINKER_INITIALIZED);
103 104
104 extern int RendererMain(const MainFunctionParams&);
105 extern int NaClMain(const MainFunctionParams&); 105 extern int NaClMain(const MainFunctionParams&);
106 extern int ProfileImportMain(const MainFunctionParams&); 106 extern int ProfileImportMain(const MainFunctionParams&);
107 #if defined(_WIN64) 107 #if defined(_WIN64)
108 extern int NaClBrokerMain(const MainFunctionParams&); 108 extern int NaClBrokerMain(const MainFunctionParams&);
109 #endif 109 #endif
110 extern int ServiceProcessMain(const MainFunctionParams&); 110 extern int ServiceProcessMain(const MainFunctionParams&);
111 111
112 #if defined(OS_WIN) 112 #if defined(OS_WIN)
113 // TODO(erikkay): isn't this already defined somewhere? 113 // TODO(erikkay): isn't this already defined somewhere?
114 #define DLLEXPORT __declspec(dllexport) 114 #define DLLEXPORT __declspec(dllexport)
(...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, 757 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
758 sandbox::SandboxInterfaceInfo* sandbox_info) { 758 sandbox::SandboxInterfaceInfo* sandbox_info) {
759 ChromeMainDelegate chrome_main_delegate; 759 ChromeMainDelegate chrome_main_delegate;
760 return content::ContentMain(instance, sandbox_info, &chrome_main_delegate); 760 return content::ContentMain(instance, sandbox_info, &chrome_main_delegate);
761 #elif defined(OS_POSIX) 761 #elif defined(OS_POSIX)
762 int ChromeMain(int argc, char** argv) { 762 int ChromeMain(int argc, char** argv) {
763 ChromeMainDelegate chrome_main_delegate; 763 ChromeMainDelegate chrome_main_delegate;
764 return content::ContentMain(argc, argv, &chrome_main_delegate); 764 return content::ContentMain(argc, argv, &chrome_main_delegate);
765 #endif 765 #endif
766 } 766 }
OLDNEW
« no previous file with comments | « no previous file | content/app/content_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698