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

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

Issue 20172004: Split PepperPluginRegistry into the pieces that are needed in each process. content/common only nee… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 4 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_impl.cc ('k') | content/zygote/zygote_main_linux.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) 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/stack_trace.h" 8 #include "base/debug/stack_trace.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.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/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/metrics/field_trial.h" 13 #include "base/metrics/field_trial.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/pending_task.h" 18 #include "base/pending_task.h"
19 #include "base/power_monitor/power_monitor.h" 19 #include "base/power_monitor/power_monitor.h"
20 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
21 #include "base/threading/platform_thread.h" 21 #include "base/threading/platform_thread.h"
22 #include "base/time/time.h" 22 #include "base/time/time.h"
23 #include "base/timer/hi_res_timer_manager.h" 23 #include "base/timer/hi_res_timer_manager.h"
24 #include "content/child/child_process.h" 24 #include "content/child/child_process.h"
25 #include "content/common/content_constants_internal.h" 25 #include "content/common/content_constants_internal.h"
26 #include "content/common/pepper_plugin_registry.h"
27 #include "content/public/common/content_switches.h" 26 #include "content/public/common/content_switches.h"
28 #include "content/public/common/main_function_params.h" 27 #include "content/public/common/main_function_params.h"
29 #include "content/public/renderer/content_renderer_client.h" 28 #include "content/public/renderer/content_renderer_client.h"
30 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h" 29 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h"
30 #include "content/renderer/pepper/pepper_plugin_registry.h"
31 #include "content/renderer/pepper/ppapi_interface_factory.h" 31 #include "content/renderer/pepper/ppapi_interface_factory.h"
32 #include "content/renderer/render_process_impl.h" 32 #include "content/renderer/render_process_impl.h"
33 #include "content/renderer/render_thread_impl.h" 33 #include "content/renderer/render_thread_impl.h"
34 #include "content/renderer/renderer_main_platform_delegate.h" 34 #include "content/renderer/renderer_main_platform_delegate.h"
35 #include "ui/base/ui_base_switches.h" 35 #include "ui/base/ui_base_switches.h"
36 #include "webkit/child/webkit_child_helpers.h" 36 #include "webkit/child/webkit_child_helpers.h"
37 #include "webkit/glue/webkit_glue.h" 37 #include "webkit/glue/webkit_glue.h"
38 38
39 #if defined(OS_MACOSX) 39 #if defined(OS_MACOSX)
40 #include <Carbon/Carbon.h> 40 #include <Carbon/Carbon.h>
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 base::MessageLoop::current()->Run(); 254 base::MessageLoop::current()->Run();
255 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 255 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
256 } 256 }
257 } 257 }
258 platform.PlatformUninitialize(); 258 platform.PlatformUninitialize();
259 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 259 TRACE_EVENT_END_ETW("RendererMain", 0, "");
260 return 0; 260 return 0;
261 } 261 }
262 262
263 } // namespace content 263 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/zygote/zygote_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698