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

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

Issue 7978009: Split ppapi::PluginList from PepperPluginRegistry so that DRT could load pepper plugins. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view.cc ('k') | webkit/glue/webkit_glue.gypi » ('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 "content/renderer/renderer_main.h" 5 #include "content/renderer/renderer_main.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/mac/scoped_nsautorelease_pool.h" 10 #include "base/mac/scoped_nsautorelease_pool.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/stats_counters.h" 15 #include "base/metrics/stats_counters.h"
16 #include "base/path_service.h" 16 #include "base/path_service.h"
17 #include "base/process_util.h" 17 #include "base/process_util.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "base/system_monitor/system_monitor.h" 19 #include "base/system_monitor/system_monitor.h"
20 #include "base/threading/platform_thread.h" 20 #include "base/threading/platform_thread.h"
21 #include "base/time.h" 21 #include "base/time.h"
22 #include "content/common/content_counters.h" 22 #include "content/common/content_counters.h"
23 #include "content/common/content_switches.h" 23 #include "content/common/content_switches.h"
24 #include "content/common/hi_res_timer_manager.h"
24 #include "content/common/main_function_params.h" 25 #include "content/common/main_function_params.h"
25 #include "content/common/hi_res_timer_manager.h"
26 #include "content/common/pepper_plugin_registry.h" 26 #include "content/common/pepper_plugin_registry.h"
27 #include "content/renderer/render_process_impl.h" 27 #include "content/renderer/render_process_impl.h"
28 #include "content/renderer/render_thread.h" 28 #include "content/renderer/render_thread.h"
29 #include "content/renderer/renderer_main_platform_delegate.h" 29 #include "content/renderer/renderer_main_platform_delegate.h"
30 #include "ui/base/ui_base_switches.h" 30 #include "ui/base/ui_base_switches.h"
31 31
32 #if defined(OS_MACOSX) 32 #if defined(OS_MACOSX)
33 #include <Carbon/Carbon.h> 33 #include <Carbon/Carbon.h>
34 #include <signal.h> 34 #include <signal.h>
35 #include <unistd.h> 35 #include <unistd.h>
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 pool->Recycle(); 228 pool->Recycle();
229 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0); 229 TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
230 MessageLoop::current()->Run(); 230 MessageLoop::current()->Run();
231 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 231 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
232 } 232 }
233 } 233 }
234 platform.PlatformUninitialize(); 234 platform.PlatformUninitialize();
235 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 235 TRACE_EVENT_END_ETW("RendererMain", 0, "");
236 return 0; 236 return 0;
237 } 237 }
OLDNEW
« no previous file with comments | « content/renderer/render_view.cc ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698