diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-21 23:19:04 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-21 23:19:04 +0000 |
| commit | 53c607c59c37f81db4611d0fdd42b0f2d8869e86 (patch) | |
| tree | a3695b63259c2e879657794f6776407ed6dc2ade /chrome/renderer/renderer_main.cc | |
| parent | 1acaaa82022e7e7003bdcff770e96c074da349c0 (diff) | |
| download | chromium_src-53c607c59c37f81db4611d0fdd42b0f2d8869e86.zip chromium_src-53c607c59c37f81db4611d0fdd42b0f2d8869e86.tar.gz chromium_src-53c607c59c37f81db4611d0fdd42b0f2d8869e86.tar.bz2 | |
Fix crash in single process mode because ChromeRenderContentClient wasn't being initialized. Also moved Mac one-time renderer initialization code into the same location, instead of RenderView's constructor.
Review URL: http://codereview.chromium.org/6718008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_main.cc')
| -rw-r--r-- | chrome/renderer/renderer_main.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc index 06e71d3..49bdc54 100644 --- a/chrome/renderer/renderer_main.cc +++ b/chrome/renderer/renderer_main.cc @@ -28,7 +28,6 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/net/net_resource_provider.h" #include "chrome/common/pepper_plugin_registry.h" -#include "chrome/renderer/chrome_content_renderer_client.h" #include "chrome/renderer/renderer_main_platform_delegate.h" #include "chrome/renderer/render_process_impl.h" #include "chrome/renderer/render_thread.h" @@ -208,9 +207,6 @@ class RendererMessageLoopObserver : public MessageLoop::TaskObserver { int RendererMain(const MainFunctionParams& parameters) { TRACE_EVENT_BEGIN("RendererMain", 0, ""); - chrome::ChromeContentRendererClient renderer_client; - content::GetContentClient()->set_renderer(&renderer_client); - const CommandLine& parsed_command_line = parameters.command_line_; base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_; |