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

Side by Side Diff: content/renderer/renderer_main.cc

Issue 10868012: Browser Plugin: New Implementation (Browser Side) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master-trial-obrowser
Patch Set: Fix mac build + Address nits from awong@ Created 8 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
OLDNEW
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 "base/base_switches.h" 5 #include "base/base_switches.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/debug/debugger.h" 7 #include "base/debug/debugger.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/hi_res_timer_manager.h" 9 #include "base/hi_res_timer_manager.h"
10 #include "base/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/metrics/field_trial.h" 12 #include "base/metrics/field_trial.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/metrics/statistics_recorder.h" 15 #include "base/metrics/statistics_recorder.h"
16 #include "base/metrics/stats_counters.h" 16 #include "base/metrics/stats_counters.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/process_util.h" 18 #include "base/process_util.h"
19 #include "base/string_util.h" 19 #include "base/string_util.h"
20 #include "base/system_monitor/system_monitor.h" 20 #include "base/system_monitor/system_monitor.h"
21 #include "base/threading/platform_thread.h" 21 #include "base/threading/platform_thread.h"
22 #include "base/time.h" 22 #include "base/time.h"
23 #include "content/common/pepper_plugin_registry.h" 23 #include "content/common/pepper_plugin_registry.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "content/public/common/main_function_params.h" 25 #include "content/public/common/main_function_params.h"
26 #include "content/public/renderer/content_renderer_client.h" 26 #include "content/public/renderer/content_renderer_client.h"
27 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
27 #include "content/renderer/render_process_impl.h" 28 #include "content/renderer/render_process_impl.h"
28 #include "content/renderer/render_thread_impl.h" 29 #include "content/renderer/render_thread_impl.h"
29 #include "content/renderer/renderer_main_platform_delegate.h" 30 #include "content/renderer/renderer_main_platform_delegate.h"
30 #include "ui/base/ui_base_switches.h" 31 #include "ui/base/ui_base_switches.h"
31 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 32 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
32 33
33 #if defined(OS_MACOSX) 34 #if defined(OS_MACOSX)
34 #include <Carbon/Carbon.h> 35 #include <Carbon/Carbon.h>
35 #include <signal.h> 36 #include <signal.h>
36 #include <unistd.h> 37 #include <unistd.h>
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 bool run_loop = true; 211 bool run_loop = true;
211 if (!no_sandbox) { 212 if (!no_sandbox) {
212 run_loop = platform.EnableSandbox(); 213 run_loop = platform.EnableSandbox();
213 } else { 214 } else {
214 LOG(ERROR) << "Running without renderer sandbox"; 215 LOG(ERROR) << "Running without renderer sandbox";
215 } 216 }
216 #if defined(OS_POSIX) && !defined(OS_MACOSX) 217 #if defined(OS_POSIX) && !defined(OS_MACOSX)
217 RenderProcessImpl render_process; 218 RenderProcessImpl render_process;
218 new RenderThreadImpl(); 219 new RenderThreadImpl();
219 #endif 220 #endif
221 new content::BrowserPluginManagerImpl();
220 222
221 platform.RunSandboxTests(); 223 platform.RunSandboxTests();
222 224
223 startup_timer.Stop(); // End of Startup Time Measurement. 225 startup_timer.Stop(); // End of Startup Time Measurement.
224 226
225 if (run_loop) { 227 if (run_loop) {
226 #if defined(OS_MACOSX) 228 #if defined(OS_MACOSX)
227 if (pool) 229 if (pool)
228 pool->Recycle(); 230 pool->Recycle();
229 #endif 231 #endif
230 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0); 232 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
231 MessageLoop::current()->Run(); 233 MessageLoop::current()->Run();
232 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 234 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
233 } 235 }
234 } 236 }
235 platform.PlatformUninitialize(); 237 platform.PlatformUninitialize();
236 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 238 TRACE_EVENT_END_ETW("RendererMain", 0, "");
237 return 0; 239 return 0;
238 } 240 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698