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

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

Issue 525513003: Cleanup: Put more plugin code behind the ENABLE_PLUGINS ifdef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 | « content/renderer/render_thread_impl.cc ('k') | content/utility/utility_thread_impl.h » ('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/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "base/sys_info.h" 20 #include "base/sys_info.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/public/common/content_switches.h" 26 #include "content/public/common/content_switches.h"
27 #include "content/public/common/main_function_params.h" 27 #include "content/public/common/main_function_params.h"
28 #include "content/public/renderer/content_renderer_client.h" 28 #include "content/public/renderer/content_renderer_client.h"
29 #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/render_process_impl.h" 30 #include "content/renderer/render_process_impl.h"
32 #include "content/renderer/render_thread_impl.h" 31 #include "content/renderer/render_thread_impl.h"
33 #include "content/renderer/renderer_main_platform_delegate.h" 32 #include "content/renderer/renderer_main_platform_delegate.h"
34 #include "ui/base/ui_base_switches.h" 33 #include "ui/base/ui_base_switches.h"
35 34
36 #if defined(OS_ANDROID) 35 #if defined(OS_ANDROID)
37 #include "third_party/skia/include/core/SkGraphics.h" 36 #include "third_party/skia/include/core/SkGraphics.h"
38 #endif // OS_ANDROID 37 #endif // OS_ANDROID
39 38
40 #if defined(OS_MACOSX) 39 #if defined(OS_MACOSX)
41 #include <Carbon/Carbon.h> 40 #include <Carbon/Carbon.h>
42 #include <signal.h> 41 #include <signal.h>
43 #include <unistd.h> 42 #include <unistd.h>
44 43
45 #include "base/mac/mac_util.h" 44 #include "base/mac/mac_util.h"
46 #include "base/mac/scoped_nsautorelease_pool.h" 45 #include "base/mac/scoped_nsautorelease_pool.h"
47 #include "base/message_loop/message_pump_mac.h" 46 #include "base/message_loop/message_pump_mac.h"
48 #include "third_party/WebKit/public/web/WebView.h" 47 #include "third_party/WebKit/public/web/WebView.h"
49 #endif // OS_MACOSX 48 #endif // OS_MACOSX
50 49
50 #if defined(ENABLE_PLUGINS)
51 #include "content/renderer/pepper/pepper_plugin_registry.h"
52 #endif
53
51 #if defined(ENABLE_WEBRTC) 54 #if defined(ENABLE_WEBRTC)
52 #include "third_party/libjingle/overrides/init_webrtc.h" 55 #include "third_party/libjingle/overrides/init_webrtc.h"
53 #endif 56 #endif
54 57
55 namespace content { 58 namespace content {
56 namespace { 59 namespace {
57 // This function provides some ways to test crash and assertion handling 60 // This function provides some ways to test crash and assertion handling
58 // behavior of the renderer. 61 // behavior of the renderer.
59 static void HandleRendererErrorTestParameters(const CommandLine& command_line) { 62 static void HandleRendererErrorTestParameters(const CommandLine& command_line) {
60 if (command_line.HasSwitch(switches::kWaitForDebugger)) 63 if (command_line.HasSwitch(switches::kWaitForDebugger))
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 base::MessageLoop::current()->Run(); 230 base::MessageLoop::current()->Run();
228 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 231 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
229 } 232 }
230 } 233 }
231 platform.PlatformUninitialize(); 234 platform.PlatformUninitialize();
232 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 235 TRACE_EVENT_END_ETW("RendererMain", 0, "");
233 return 0; 236 return 0;
234 } 237 }
235 238
236 } // namespace content 239 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/utility/utility_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698