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

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: Disable BrowserPluginHostTest.NavigateGuest on win, flaking. 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 // For convenience, we print the stack trace for crashes. We can't get 217 // For convenience, we print the stack trace for crashes. We can't get
217 // symbols when the sandbox is enabled, so only try when the sandbox is 218 // symbols when the sandbox is enabled, so only try when the sandbox is
218 // disabled. 219 // disabled.
219 base::EnableInProcessStackDumping(); 220 base::EnableInProcessStackDumping();
220 #endif 221 #endif
221 } 222 }
222 #if defined(OS_POSIX) && !defined(OS_MACOSX) 223 #if defined(OS_POSIX) && !defined(OS_MACOSX)
223 RenderProcessImpl render_process; 224 RenderProcessImpl render_process;
224 new RenderThreadImpl(); 225 new RenderThreadImpl();
225 #endif 226 #endif
227 new content::BrowserPluginManagerImpl();
226 228
227 platform.RunSandboxTests(); 229 platform.RunSandboxTests();
228 230
229 startup_timer.Stop(); // End of Startup Time Measurement. 231 startup_timer.Stop(); // End of Startup Time Measurement.
230 232
231 if (run_loop) { 233 if (run_loop) {
232 #if defined(OS_MACOSX) 234 #if defined(OS_MACOSX)
233 if (pool) 235 if (pool)
234 pool->Recycle(); 236 pool->Recycle();
235 #endif 237 #endif
236 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0); 238 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
237 MessageLoop::current()->Run(); 239 MessageLoop::current()->Run();
238 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 240 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
239 } 241 }
240 } 242 }
241 platform.PlatformUninitialize(); 243 platform.PlatformUninitialize();
242 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 244 TRACE_EVENT_END_ETW("RendererMain", 0, "");
243 return 0; 245 return 0;
244 } 246 }
OLDNEW
« no previous file with comments | « content/renderer/browser_plugin/browser_plugin_manager_impl.cc ('k') | content/test/data/browser_plugin_embedder.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698