| Index: chrome/renderer/chrome_content_renderer_client.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
| index 48f26e1980b4de763683f91c9614bb7b2db06e9b..909b6eb2576ddd3b3118f233c47f849b1983bd6b 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -49,6 +49,7 @@
|
| #include "chrome/renderer/prerender/prerender_media_load_deferrer.h"
|
| #include "chrome/renderer/prerender/prerenderer_client.h"
|
| #include "chrome/renderer/principals_extension_bindings.h"
|
| +#include "chrome/renderer/printing/chrome_print_web_view_helper_delegate.h"
|
| #include "chrome/renderer/printing/print_web_view_helper.h"
|
| #include "chrome/renderer/safe_browsing/malware_dom_details.h"
|
| #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
|
| @@ -501,13 +502,25 @@ void ChromeContentRendererClient::RenderFrameCreated(
|
|
|
| void ChromeContentRendererClient::RenderViewCreated(
|
| content::RenderView* render_view) {
|
| + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| +
|
| #if defined(ENABLE_EXTENSIONS)
|
| new extensions::ExtensionHelper(render_view, extension_dispatcher_.get());
|
| extension_dispatcher_->OnRenderViewCreated(render_view);
|
| #endif
|
| new PageLoadHistograms(render_view);
|
| #if defined(ENABLE_PRINTING)
|
| - new printing::PrintWebViewHelper(render_view);
|
| + new printing::PrintWebViewHelper(
|
| + render_view,
|
| + switches::OutOfProcessPdfEnabled(),
|
| + command_line->HasSwitch(switches::kDisablePrintPreview),
|
| +#if defined(ENABLE_EXTENSIONS)
|
| + extension_misc::kPdfExtensionId,
|
| +#else
|
| + nullptr,
|
| +#endif // ENABLE_EXTENSIONS
|
| + scoped_ptr<ChromePrintWebViewHelperDelegate>(
|
| + new ChromePrintWebViewHelperDelegate()));
|
| #endif
|
| #if defined(ENABLE_SPELLCHECK)
|
| new SpellCheckProvider(render_view, spellcheck_.get());
|
| @@ -517,7 +530,6 @@ void ChromeContentRendererClient::RenderViewCreated(
|
| safe_browsing::MalwareDOMDetails::Create(render_view);
|
| #endif
|
|
|
| - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| if (command_line->HasSwitch(switches::kInstantProcess))
|
| new SearchBox(render_view);
|
|
|
|
|