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..b6665ae5c46766d63f7a6c5a8d076863c43c597f 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -126,6 +126,10 @@ |
#include "extensions/renderer/script_context.h" |
#endif |
+#if defined(ENABLE_PRINTING) |
+#include "chrome/renderer/printing/chrome_print_web_view_helper_delegate.h" |
+#endif |
+ |
#if defined(ENABLE_PRINT_PREVIEW) |
#include "chrome/renderer/pepper/chrome_pdf_print_client.h" |
#endif |
@@ -501,13 +505,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); |
+ print_web_view_helper_delegate_.reset(new ChromePrintWebViewHelperDelegate()); |
+ new printing::PrintWebViewHelper( |
+ render_view, |
+ switches::OutOfProcessPdfEnabled(), |
+ command_line->HasSwitch(switches::kDisablePrintPreview), |
+#if defined(ENABLE_EXTENSIONS) |
+ extension_misc::kPdfExtensionId, |
sgurun-gerrit only
2015/01/06 22:57:43
will android webview pass an empty string here?
dgn
2015/01/07 16:09:17
That was the plan, yes. It's not needed anymore, w
|
+#else |
+ std::string(), |
+#endif // ENABLE_EXTENSIONS |
+ print_web_view_helper_delegate_.get()); |
#endif |
#if defined(ENABLE_SPELLCHECK) |
new SpellCheckProvider(render_view, spellcheck_.get()); |
@@ -517,7 +533,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); |