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

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

Issue 20003004: reland crrev.com/212927 Move webkitplatformsupport_impl and related from glue to child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & allocator dep for components_unittests in shared_library2 Created 7 years, 5 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/renderer/webplugin_impl.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"
(...skipping 15 matching lines...) Expand all
26 #include "content/common/content_constants_internal.h" 26 #include "content/common/content_constants_internal.h"
27 #include "content/common/pepper_plugin_registry.h" 27 #include "content/common/pepper_plugin_registry.h"
28 #include "content/public/common/content_switches.h" 28 #include "content/public/common/content_switches.h"
29 #include "content/public/common/main_function_params.h" 29 #include "content/public/common/main_function_params.h"
30 #include "content/public/renderer/content_renderer_client.h" 30 #include "content/public/renderer/content_renderer_client.h"
31 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.h" 31 #include "content/renderer/browser_plugin/browser_plugin_manager_impl.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/glue/webkit_glue.h" 37 #include "webkit/glue/webkit_glue.h"
37 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 38 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
38 39
39 #if defined(OS_MACOSX) 40 #if defined(OS_MACOSX)
40 #include <Carbon/Carbon.h> 41 #include <Carbon/Carbon.h>
41 #include <signal.h> 42 #include <signal.h>
42 #include <unistd.h> 43 #include <unistd.h>
43 44
44 #include "base/mac/mac_util.h" 45 #include "base/mac/mac_util.h"
45 #include "base/mac/scoped_nsautorelease_pool.h" 46 #include "base/mac/scoped_nsautorelease_pool.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 base::MessageLoop::current()->Run(); 248 base::MessageLoop::current()->Run();
248 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0); 249 TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
249 } 250 }
250 } 251 }
251 platform.PlatformUninitialize(); 252 platform.PlatformUninitialize();
252 TRACE_EVENT_END_ETW("RendererMain", 0, ""); 253 TRACE_EVENT_END_ETW("RendererMain", 0, "");
253 return 0; 254 return 0;
254 } 255 }
255 256
256 } // namespace content 257 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | content/renderer/webplugin_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698